Commit Graph

72 Commits

Author SHA1 Message Date
Chloe Carver-Brown 31379b786f Time to rrrumble 2021-01-16 03:14:07 +00:00
Archie 1466032728 Examine code mini fix 2021-01-15 04:00:47 -03:00
Chloe Carver-Brown 36268d0a5b Adds funny cat tongue 2021-01-13 05:06:55 +00:00
Archie 87ce4d858c Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""
This reverts commit 08c8f744a9.
2021-01-08 17:03:24 -03:00
QuoteFox 08c8f744a9 Revert "Merge pull request #838 from ArchieBeepBoop/test1"
This reverts commit b0dbacee82, reversing
changes made to 813a2ea1c7.
2021-01-08 19:28:18 +00:00
kevinz000 939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
kevinz000 12c8ebea11 Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite. 2021-01-03 05:21:47 -03:00
kevinz000 b21c65055a Surgery fix package 2021-01-02 19:03:45 -03:00
Chloe Carver-Brown c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
kevinz000 10069637a5 Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2020-12-30 00:42:50 -03:00
Archie 188cc10974 Merge remote-tracking branch 'upstream/master' into Surgery 2020-12-27 04:29:21 -03:00
Ghom 482ba4a8ee Merge pull request #10806 from Feasel/master
[Balance Patch - Tend Wounds Edition]
2020-12-27 04:27:52 -03:00
kevinz000 c27dbcaf5f Merge pull request #9522 from Linzolle/tend-wounds
Tend Wounds + Make Revival more accessible
2020-12-27 04:27:29 -03:00
Archie 5710e12cb5 Surgery ports 1 2020-12-27 04:25:28 -03:00
Ghom 0c8ed89992 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-12-25 17:30:06 -03:00
Lin a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
CygnusB ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
Dahlular a731cd1e8e Merge pull request #673 from ArchieBeepBoop/paraplegic
Fixes Paraplegic Free Real Estate
2020-11-13 19:03:01 -07:00
Dip 3fe84d7fa6 yeah no I'm fixing floating in another pr, fuck this 2020-11-10 18:03:02 -03:00
BlackMajor 8d914d0b21 Number one 2020-11-10 17:51:07 -03:00
Dip a76185269b Merge branch 'master' of https://github.com/ArchieBeepBoop/Hyper-Station-13 into syndicateleague2 2020-11-10 14:05:51 -03:00
Chemlight 8c0f1756a1 Funny-character-bus-code
This little pull is litterally a pull for a single character I'd like to bus, basicly a walking chem dispenser, so lets go!
2020-11-09 23:03:12 -08:00
kevinz000 a663b96d2f Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Syndicate Major League Player
2020-11-09 18:33:18 -03:00
Dahlular ee0017721e Merge pull request #627 from ArchieBeepBoop/spooky
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
2020-10-29 22:51:07 -06:00
kevinz000 731b38c975 Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
2020-10-28 16:25:19 -03:00
kevinz000 fa655a1b78 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2020-10-28 16:04:47 -03:00
kevinz000 2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
Dip 5470fdd25c squashing some runtimes 2020-10-23 21:15:06 -03:00
Dip c91a106b0d fixes and runtimes 2020-10-17 23:55:40 -03:00
deathride58 cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Dip aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
kevinz000 b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
Dip 72c8e681e3 runtimev1-experimental 2020-09-22 16:37:51 -03:00
Dip c35c942f72 Language Diversity / Racial fixes 2020-09-12 22:30:37 -03:00
jjpark-kb 6ce26a163f okay, here are some changes 2020-07-16 22:27:26 -04:00
JaySparrow 8ef0e74ec9 Husks and donuts
Fixes various dehusking methods, and also donut crafting.
2020-07-14 19:35:27 -05:00
JaySparrow ff689c1b12 Mammals
Fucking sprites. Fuuuuuckin sprites. Fuuuuuck.
2020-07-12 18:53:26 -05:00
JaySparrow d22532585d Synths
Fuckin no brim robot assholes fuckin wrecking the code fuck.
2020-07-12 15:24:26 -05:00
Dahlular 013700153f thank you digitigrade legs, very cool 2020-07-07 23:58:24 -05:00
Dahlular 18588e6f99 funny synth port part 1 which may or may not have broken a lot 2020-07-07 23:58:21 -05:00
Jay-Sparrow d23d193a68 Re-enable orgasm command for MK Ultra
The command for orgasm was always programmed into MK, and functions like it does for Voice of God, but was commented out. All this does is uncomment the code so it will work again.
2020-06-11 15:27:57 -05:00
SlimeRetard cc1b0ef04c Add breast and penis augmentation surgeries 2020-06-04 02:19:02 +01:00
QuoteFox 5ef32f42a1 a
a fuck off mate.
2020-03-28 09:34:48 +00:00
QuoteFox 7562eace10 Fixed hands sprite for markings.
Fixed because I fucked up. But hands should be fixed for mam markings now.
2020-03-28 09:34:02 +00:00
QuoteFox fbf75e7be1 Fixed hands sprite for markings.
Fixed marking hands sprites.
2020-03-28 09:32:35 +00:00
Improvedname f376b64f31 AAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
Improvedname 83cee8d8f8 nani 2020-03-18 21:25:16 +01:00
Dahlular 50727cfd0a Fixes Skeletons Tongues Burning
ARHHRHRHGGHH
2020-03-17 13:18:20 -06:00
zeskorion 2312f4a5a7 Update bodyparts.dm 2020-02-23 17:24:10 -08:00
zeskorion be804471c8 Update head.dm 2020-02-23 17:20:24 -08:00