Commit Graph

58 Commits

Author SHA1 Message Date
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
quotefox aaeca40d3f bonecode 2019-11-26 12:38:19 +00:00
quotefox 20d85b8d35 bones breaking system 2019-11-25 07:11:44 +00:00
quotefox 739240592e - Fix to github 2019-11-08 21:50:59 +00:00
quotefox 23d7ac11af Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
# Conflicts:
#	icons/obj/device.dmi
2019-11-08 20:55:57 +00:00
quotefox 19810f7e98 Merge pull request #59 from Azarak/master
It's me trying to fix a conflict and I've never done this don't mind me
2019-11-08 20:48:47 +00:00
quotefox ace551ba39 bone stuff 2019-11-08 20:48:18 +00:00
Azarak 1544eafb4f TG GENETICS AAAAAAAA
aaaaaaaa
2019-11-04 23:20:16 +01:00
quotefox d775e4eef3 update 2019-11-01 08:24:56 +00:00
quotefox 8144df3a15 Merge pull request #50 from shellspeed1/stasis-bed-improvements
Borgs can now unbuckle people from stasis beds, Surgery is now performable on stasis beds.
2019-10-29 03:22:09 +00:00
shellspeed1 e7522ce64c can now operate on stasis beds 2019-10-26 12:46:46 -07:00
quotefox 45cb9072cd Merge pull request #41 from shellspeed1/organ-healing-fixes
Fixes Issue with Tounge, Stomach, and heart not passively healing.
2019-10-25 17:09:06 +01:00
shellspeed1 29414a14ed aaaaaa 2019-10-23 01:32:03 -07:00
shellspeed1 ac75adb229 fixes to embalming 2019-10-20 16:00:25 -07:00
shellspeed1 ecd768fdc4 more surgery fixes 2019-10-20 15:34:02 -07:00