shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,796 Commits 5 Branches 0 Tags
db87da599c19afda6b62af80cdab2c0bce0c47fa
Commit Graph

1268 Commits

Author SHA1 Message Date
kevinz000
1cf2311930 Merge pull request #12164 from Ghommie/Ghommie-cit733 
Porting "Refactors language holder"
 2020-05-10 14:16:42 -07:00
Lin
dd7db603d2 Merge pull request #12159 from Ghommie/Ghommie-cit732 
'mob_run_block' and 'mob_check_block' macros
 2020-05-10 18:25:16 +00:00
kiwedespars
a6ad4dc9bf changeling rebalance. (#12134) 
* Update fleshmend.dm

* Update shriek.dm

* Update mutations.dm

* makes aug-eyes into actual thermals.

* removing regen jelly and mannitol from adrenals

* Update strained_muscles.dm

* Update chameleon_skin.dm

* Update biodegrade.dm

* Update fleshmend.dm

whoops, forgot to add the loudness text.

* Update fleshmend.dm

why do i keep doing this.

* holy shit i'm tired.

* Update code/modules/antagonists/changeling/powers/augmented_eyesight.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update augmented_eyesight.dm

* Update augmented_eyesight.dm

* Update augmented_eyesight.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-09 14:38:18 +02:00
Putnam3145
3531459d8b Some trauma rebalancing (#12144) 
* Some trauma rebalancing.

* Wow I didn't actually commit the 50% change

* when did i stop compiling before pushing
 2020-05-09 01:42:39 +02:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie
a412e840f7 'mob_run_block' and 'mob_check_block' macros 2020-05-08 18:52:32 +02:00
Detective-Google
bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002) 
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
 2020-05-07 14:46:16 +02:00
kevinz000
8f29839dbf Runechat Port (#12065) 
* A

* A

* Ports Runechat

* compile fix

* fuck

* maybe?

* will this work?

* PLEASE

* fix

* fuck this
 2020-05-03 03:53:19 +02:00
Putnam3145
c1d1e4f0c0 Properly closes some bold tags. (#12088) 
* Fixes some unmatched <b>s

* remember to ctrl+s
 2020-05-02 14:53:17 +02:00
Arturlang
16b172c178 Fixes and tweaks for bloodsuckers (#12055) 
* Tweaaakkksss

* Tweaks and stuff

* Compile
 2020-05-01 18:00:15 +02:00
Lin
19f89ed1ba Merge pull request #12022 from Ghommie/Ghommie-cit711 
organ/on_life tweaks.
 2020-04-29 01:15:02 +00:00
Ghom
0cb32c901e Merge pull request #12013 from kappa-sama/patch-23 
lowers plasmafist to standard spell costs
 2020-04-26 13:45:28 +02:00
kevinz000
d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller 
More dynamic tweaks
 2020-04-25 17:05:38 -07:00
kevinz000
d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679 
A peeve with random bodies.
 2020-04-25 16:59:07 -07:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Ghommie
8440b48a9a organ/on_life tweaks. 2020-04-25 16:19:43 +02:00
kappa-sama
1f5c66651a costs 2020-04-24 21:02:58 -04:00
Putnam
95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie
de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie
63f5e101a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit700 2020-04-22 22:30:10 +02:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
Lin
20f2d5d961 Merge pull request #11964 from Citadel-Station-13/Ghommie-patch-2 
Makes the human form ling power work again.
 2020-04-22 16:07:49 +00:00
Putnam
44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghom
6467cc9647 Merge pull request #11958 from Putnam3145/ling-kill-once 
Makes ling kill objectives kill-once
 2020-04-22 04:05:06 +02:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Ghom
a475355c93 Update humanform.dm 2020-04-21 15:28:12 +02:00
Ghom
79eb0f5838 Merge pull request #11956 from Trilbyspaceclone/crafting_menu 
Fixes Crafting menu
 2020-04-21 01:25:46 +02:00
TrilbySpaceClone
58cb5e391e *scream* 2020-04-20 18:22:13 -04:00
Putnam
75ef1c3731 Makes ling kill objectives kill-once 2020-04-20 14:39:43 -07:00
Putnam
9976fab42b Made traitor classes rerollable, reassignable by admins 2020-04-18 14:40:41 -07:00
Artur
eafc69aa65 Reviewer suggestion, reduces paralyze 
And ports that commit that ghommie said
 2020-04-17 16:22:15 +03:00
kevinz000
09f459a369 Merge pull request #11730 from Ghommie/Ghommie-cit667 
Minor snowflakes clothing variations refactor. Removal of copypasted states.
 2020-04-17 05:49:09 -07:00
Ghommie
fe43581d31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-16 15:09:52 +02:00
Artur
ddcfcb5cd8 Conflicts sure are !!FUN!! 
Also adds dolphin gloves to the glove crate, and fixes fortitude
 2020-04-15 12:33:59 +03:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Artur
aecbce222a Comment because why the heck not 2020-04-15 12:12:06 +03:00
Artur
375c62175f Finishing touches, fixes icons 2020-04-15 12:04:25 +03:00
Ghommie
571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
Ghom
55402b1834 Merge branch 'master' into Ghommie-cit679 2020-04-14 16:22:00 +02:00
Artur
356f2913d7 Ghommies suggestions and renames a proc 2020-04-14 09:30:14 +03:00
Artur
f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
Artur
325c011142 Comsigs are hard... 2020-04-14 09:07:37 +03:00
Ghommie
e753c1ad14 Fixed a little peeve with random bodies. 2020-04-14 02:20:19 +02:00
Ghommie
42ff9b1d35 Final test, fixes and parent calls. 2020-04-14 01:23:26 +02:00
Ghommie
db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
kevinz000
9f2ed092c5 Merge pull request #11275 from Citadel-Station-13/Ghommie-patch-6 
Reenables the swarmers event.
 2020-04-13 05:50:24 -07:00
kevinz000
768909020e Merge pull request #11827 from kiwedespars/nerf 
nerfs immortal haste cd
 2020-04-12 22:35:10 -07:00