Merge pull request #68 from MysticalFaceLesS/beta-dev

Перенос обновлений с beta-dev на stable #2

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,41 +1,12 @@
-## About the Pull Request
-
-<!-- Describe the Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->
-
-## Why It's Good For The Game
-
-<!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->
-
-## Changelog
-
-:cl:
-add: Added new mechanics or gameplay changes
-add: Added more things
-del: Removed old things
-qol: made something easier to use
-balance: rebalanced something
-fix: fixed a few things
-soundadd: added a new sound thingy
-sounddel: removed an old sound thingy
-imageadd: added some icons and images
-imagedel: deleted some icons and images
-spellcheck: fixed a few typos
-code: changed some code
-refactor: refactored some code
-config: changed some config setting
-admin: messed with admin stuff
-server: something server ops should know
-/:cl:
-
-<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
-<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
+<!-- ЗДЕСЬ должно быть **подробное описание** того, что происходит в PR и зачем это нужно. PR не должен содержать изменений, о которых здесь ничего не сказано. -->
+ПР делает что-то умное
 
 <!--
-Examples were changelog entries are optional/not typically required but encouraged:
-* Cosmetic changes such as descriptions, sound effects, etc.
-* Optimizations and other changes to underlying systems which do not affect gameplay.
-* Minor bug fixes.
-
-As a courtesy, for ported PRs, please include if you have the blessing of the author. While not required, we encourage basic decency in porting others' work. It is also sufficient to note that the author has not expressed displeasure at the idea of their work getting ported.
-Please refrain from porting works of authors that have expressed displeasure in having their work ported, thank you.
+  Честно заполняем галочки. Чем больше галочек, тем быстрее проверять Pull Request, соответственно он быстрее будет принят.
+  Чтобы отметить - ставим `x` (икс) внутри квадратных скобочек вот так: `- [x] ...`.
+  Галочки можно доставлять позже по мере окончания работы над PR'ом.
 -->
+
+- [ ] Pull Request полностью завершен, мне не нужна помощь чтобы его закончить.
+- [ ] Я внимательно прочитал все свои изменения и багов в них не нашел.
+- [ ] Я запускал сервер со своими изменениями локально и все протестировал.

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Build and Publish Image to Registry
       env:
         BUILD_ARGS: -Icustom-items/inc.dm
-      uses: elgohr/Publish-Docker-Github-Action@187c0b3df7bb620dbfc7886e3a54dd48203a55b1
+      uses: elgohr/Publish-Docker-Github-Action@e10960cb1a122ec21f80672099d68928892a106d
       with:
         name: ${{ secrets.IMAGE_NAME }}
         username: ${{ secrets.REG_USER }}

code/_helpers/text.dm

@@ -468,6 +468,13 @@
 	t = replacetext(t, "\[dealogo\]", "<img src = dea.png>")
 	t = replacetext(t, "\[intlogo\]", "<img src = int.png>")
 	t = replacetext(t, "\[triblogo\]", "<img src = trib.png>")
+	t = replacetext(t, "\[aiadlogo\]", "<img src = aiad.png>")
+	t = replacetext(t, "\[amdlogo\]", "<img src = amd.png>")
+	t = replacetext(t, "\[dcdlogo\]", "<img src = dcd.png>")
+	t = replacetext(t, "\[fsdlogo\]", "<img src = fsd.png>")
+	t = replacetext(t, "\[misilogo\]", "<img src = misi.png>")
+	t = replacetext(t, "\[patalogo\]", "<img src = pata.png>")
+	t = replacetext(t, "\[raisalogo\]", "<img src = raisa.png>")
 	t = replacetext(t, "\[goclogo\]", "<img src = ungoc.png>")
 	t = replacetext(t, "\[uiulogo\]", "<img src = uiu.png>")
 	t = replacetext(t, "\[thilogo\]", "<img src = thi.png>")
@@ -476,6 +483,11 @@
 	t = replacetext(t, "\[cilogo\]", "<img src = ci.png>")
 	t = replacetext(t, "\[shlogo\]", "<img src = sh.png>")
 	t = replacetext(t, "\[cotbglogo\]", "<img src = cotbg.png>")
+	t = replacetext(t, "\[coclogo\]", "<img src = coc.png>")
+	t = replacetext(t, "\[cmaxlogo\]", "<img src = cmax.png>")
+	t = replacetext(t, "\[mcflogo\]", "<img src = mcf.png>")
+	t = replacetext(t, "\[wwslogo\]", "<img src = wws.png>")
+	t = replacetext(t, "\[spclogo\]", "<img src = spc.png>")
 	return t
 
 //pencode translation to html for tags exclusive to digital files (currently email, nanoword, report editor fields,

code/_onclick/click.dm

@@ -237,10 +237,14 @@
 /*
 	Middle-Alt click
 	Used for pointing at something
-	|= Transfer to mod_celadon/_components/code/_components.dm =| */
-/* /mob/proc/AltMiddleClickOn(atom/A)
-	pointed(A)
-	return */
+*/
+// Фокусировка взгляда на Alt + СКМ
+/mob/proc/AltMiddleClickOn(atom/A)
+	// [CELADON-EDIT] - CELADON_COMPONENTS
+	// pointed(A) // CELADON-EDIT - ORIGINAL
+	face_direction(A)
+	// [/CELADON-EDIT]
+	return
 
 /*
 	Middle-Shift click
@@ -325,15 +329,14 @@
 /*
 	Control+Alt click
 */
+
 /mob/proc/CtrlAltClickOn(atom/A)
 	if(A.CtrlAltClick(src))
 		return
-	pointed(A)
 
 /atom/proc/CtrlAltClick(mob/user)
 	return
 
-
 /*
 	Rclick.
 */

code/datums/outfits/jobs/engineering.dm

@@ -11,22 +11,28 @@
 	l_pocket = /obj/item/device/radio
 	l_ear = /obj/item/device/radio/headset/heads/ce
 
-/* /decl/hierarchy/outfit/job/engineering/conteng			Celadon Changes => mod_celadon/outfits/code/outfits.dm
+/decl/hierarchy/outfit/job/engineering/conteng
 	name = OUTFIT_JOB_NAME("Containment Engineer")
 	uniform = /obj/item/clothing/under/solgov/utility/fleet/engineering
 	shoes = /obj/item/clothing/shoes/dutyboots
 	id_type = /obj/item/card/id/seclvl4eng
 	belt = /obj/item/storage/belt/utility/full
 	l_pocket = /obj/item/device/radio
-	l_ear = /obj/item/device/radio/headset/conteng */
+	l_ear = /obj/item/device/radio/headset/conteng
 
 /decl/hierarchy/outfit/job/engineering/seneng
 	name = OUTFIT_JOB_NAME("Senior Engineer")
 	uniform = /obj/item/clothing/under/solgov/utility/fleet/engineering
 	shoes = /obj/item/clothing/shoes/dutyboots
-	id_type = /obj/item/card/id/seclvl4eng
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	// id_type = /obj/item/card/id/seclvl4eng // CELADON-EDIT - ORIGINAL
+	id_type = /obj/item/card/id/seclvl4conteng
+	// [/CELADON-EDIT]
 	belt = /obj/item/storage/belt/utility/full
 	l_pocket = /obj/item/device/radio
+	// [CELADON-ADD] - CELADON_OUTFITS
+	r_ear = /obj/item/device/radio/headset/conteng/alt
+	// [/CELADON-ADD]
 	l_ear = /obj/item/device/radio/headset/heads/ce
 
 /decl/hierarchy/outfit/job/engineering/juneng

code/datums/outfits/jobs/mtf.dm

@@ -10,11 +10,15 @@
 /decl/hierarchy/outfit/mtf/epsilon_11
 	hierarchy_type = /decl/hierarchy/outfit/mtf/epsilon_11
 
-/* /decl/hierarchy/outfit/mtf/epsilon_11/agent
+/decl/hierarchy/outfit/mtf/epsilon_11/agent
 	name = OUTFIT_JOB_NAME("MTF Epsilon-11 Agent")
 	uniform = /obj/item/clothing/under/ert/epsilon11
-	suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon
-	head = /obj/item/clothing/head/helmet/ballistic
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	// suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon // CELADON-EDIT - ORIGINAL
+	// head = /obj/item/clothing/head/helmet/ballistic // CELADON-EDIT - ORIGINAL
+	suit = /obj/item/clothing/suit/armor/vest/scp/medarmor/MTFlight
+	head = /obj/item/clothing/head/helmet/scp/lwh_helmet
+	// [/CELADON-EDIT]
 	mask = /obj/item/clothing/mask/balaclava/tactical
 	glasses = /obj/item/clothing/glasses/night
 	gloves = /obj/item/clothing/gloves/tactical/scp
@@ -31,8 +35,12 @@
 /decl/hierarchy/outfit/mtf/epsilon_11/breacher
 	name = OUTFIT_JOB_NAME("MTF Epsilon-11 Breacher")
 	uniform = /obj/item/clothing/under/ert/epsilon11
-	suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon
-	head = /obj/item/clothing/head/helmet/ballistic
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	// suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon // CELADON-EDIT - ORIGINAL
+	// head = /obj/item/clothing/head/helmet/ballistic // CELADON-EDIT - ORIGINAL
+	suit = /obj/item/clothing/suit/armor/vest/scp/medarmor/MTFmedium
+	head = /obj/item/clothing/head/helmet/scp/lwh_helmet
+	// [/CELADON-EDIT]
 	mask = /obj/item/clothing/mask/balaclava/tactical
 	glasses = /obj/item/clothing/glasses/night
 	gloves = /obj/item/clothing/gloves/tactical/scp
@@ -49,8 +57,12 @@
 /decl/hierarchy/outfit/mtf/epsilon_11/leader
 	name = OUTFIT_JOB_NAME("MTF Epsilon-11 Team Leader")
 	uniform = /obj/item/clothing/under/ert/epsilon11
-	suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon
-	head = /obj/item/clothing/head/beret/mtf
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	// suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon // CELADON-EDIT - ORIGINAL
+	// head = /obj/item/clothing/head/beret/mtf // CELADON-EDIT - ORIGINAL
+	suit = /obj/item/clothing/suit/armor/vest/scp/medarmor/MTFlight
+	head = /obj/item/clothing/head/helmet/scp/lwh_helmet
+	// [/CELADON-EDIT]
 	mask = /obj/item/clothing/mask/balaclava
 	glasses = /obj/item/clothing/glasses/night
 	gloves = /obj/item/clothing/gloves/tactical/scp
@@ -80,7 +92,7 @@
 	r_pocket = null
 	id_type = /obj/item/card/id/mtf/ninetail
 	belt = /obj/item/defibrillator/compact/combat/loaded
-	backpack_contents = list(/obj/item/ammo_magazine/scp/p90_mag/ap = 3,/obj/item/clothing/mask/gas = 1,/obj/item/reagent_containers/ivbag/blood/OMinus = 2,/obj/item/storage/pill_bottle/zoom = 1) */
+	backpack_contents = list(/obj/item/ammo_magazine/scp/p90_mag/ap = 3,/obj/item/clothing/mask/gas = 1,/obj/item/reagent_containers/ivbag/blood/OMinus = 2,/obj/item/storage/pill_bottle/zoom = 1)
 
 /decl/hierarchy/outfit/mtf/eta_10 // See No Evil
 	name = OUTFIT_JOB_NAME("MTF Eta-10 Operative")