Commit Graph

26370 Commits

Author SHA1 Message Date
Maxim Nikitin 64b4abca4b oopsie 2020-10-02 12:05:05 -04:00
Maxim Nikitin 96d46ca0e4 Makes the slimeperson swap-body UI stay open when you switch bodies 2020-10-02 12:03:24 -04:00
timothyteakettle 6533d850c2 compile 2020-10-02 16:42:06 +01:00
timothyteakettle ab83185ffc oh no 2020-10-02 16:40:34 +01:00
timothyteakettle 418cd44bbe SQUISH 2020-10-02 16:31:33 +01:00
timothyteakettle 950cb05617 Merge remote-tracking branch 'upstream/master' into slime-puddle 2020-10-02 15:53:48 +01:00
timothyteakettle 318729031c newlines good for the soul 2020-10-02 14:55:39 +01:00
timothyteakettle 158b1d584f woopsy 2020-10-02 14:54:57 +01:00
timothyteakettle 3ba9031fe2 Revert "gender part support"
This reverts commit 358041c2ef.
2020-10-02 14:54:05 +01:00
timothyteakettle 358041c2ef gender part support 2020-10-02 14:50:42 +01:00
timothyteakettle 32f32d7e62 compile 2020-10-02 02:33:33 +01:00
timothyteakettle 3fc016e19d better movement 2020-10-02 02:32:10 +01:00
Hatterhat 0310e3ebd5 please travis stop crashing on me 2020-10-01 19:10:13 -05:00
Tupinambis d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
timothyteakettle 26cfac8988 brrr 2020-10-01 23:57:01 +01:00
timothyteakettle eb31434b7b final fix 2020-10-01 23:54:50 +01:00
timothyteakettle 13f1b59133 typo 2020-10-01 23:41:54 +01:00
timothyteakettle 203246ece7 FUCK 2020-10-01 23:40:57 +01:00
Tupinambis a2fbd76a49 fix travis? 2020-10-01 17:37:53 -05:00
timothyteakettle c602ad1cab yes 2020-10-01 23:13:53 +01:00
Tupinambis f1bc1ccafb Merge branch 'master' into spooder
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
2020-10-01 17:10:42 -05:00
timothyteakettle 121ec996cf fuck it no resting 2020-10-01 23:09:20 +01:00
Timothy Teakettle 03ad9eb052 experimental test 2020-10-01 22:51:40 +01:00
silicons f6dccd5ac5 Merge pull request #12439 from timothyteakettle/cool-ipcs
makes ipcs more like robots (a partial port from skyrat)
2020-10-01 14:15:04 -07:00
silicons cfddef7769 Update unsorted.dm 2020-10-01 14:13:01 -07:00
Timothy Teakettle 710ab0ffa6 Update eyes.dm 2020-10-01 22:06:03 +01:00
silicons 7e7fd351c1 Merge pull request #13475 from Detective-Google/clothing
Ports a few RP clothings and adds the detective clothing vendor
2020-10-01 14:04:52 -07:00
silicons 201134d15c Merge pull request #13471 from zeroisthebiggay/patch-2
adds "clicks" as a speech verb in the character creator
2020-10-01 14:03:44 -07:00
Timothy Teakettle b73770c3bc fuck 2020-10-01 22:03:15 +01:00
Timothy Teakettle 57733473fe TRAIT SOURCE DEFINE 2020-10-01 21:23:17 +01:00
Timothy Teakettle cd81cd4402 why 2020-10-01 21:19:40 +01:00
Timothy Teakettle 7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Timothy Teakettle 14e217082f compile 2020-10-01 20:51:53 +01:00
silicons 05e1f7ca99 Update debuffs.dm 2020-10-01 12:50:41 -07:00
silicons 1f82e8985c Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
2020-10-01 12:15:49 -07:00
Detective Google 57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
Detective Google 98703e6ad6 Merge remote-tracking branch 'upstream/master' into arcade-carpets 2020-10-01 13:41:10 -05:00
Tupinambis 5d4429a61a You can now have none 2020-10-01 12:57:07 -05:00
Timothy Teakettle e1123ad7fe color define 2020-10-01 18:55:32 +01:00
DeltaFire 173ecfaa6c prevents pacifists from performing harmful counter attacks 2020-10-01 17:58:14 +02:00
DeltaFire e012b8f082 typo 2020-10-01 17:18:28 +02:00
DeltaFire d54a899695 fixes KA modkits being installed in borgs by others
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02:00
CoreFlare 9d76f6af80 good cloaks
i like gooder cloaks
2020-10-01 15:08:39 +01:00
The0bserver 9e702c2ede No more self sufficiency. 2020-10-01 06:49:54 -04:00
The0bserver e0089ea813 Again? 2020-10-01 06:44:11 -04:00
Letter N 84a6624b03 Update cinematic.dm 2020-10-01 18:18:24 +08:00
silicons c8d6f3d22a Merge pull request #13477 from LetterN/patch-2
Adds craftable railings
2020-10-01 03:13:51 -07:00
silicons d8e58b1c48 Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
silicons 3149732bbb Merge pull request #13441 from Putnam3145/shiver-fever-patch
Makes fever use the proper thresholds and shivering have thresholds at all.
2020-10-01 03:11:23 -07:00
silicons 71de73e16b Merge pull request #13423 from MrJWhit/drone-e-button
Gives drones back their e button (port)
2020-10-01 03:11:04 -07:00