Commit Graph

16777 Commits

Author SHA1 Message Date
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 32f32d7e62 compile 2020-10-02 02:33:33 +01:00
timothyteakettle 3fc016e19d better movement 2020-10-02 02:32:10 +01: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
timothyteakettle c602ad1cab yes 2020-10-01 23:13:53 +01: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
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
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 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
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
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 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
silicons fba8bfbf4f Merge pull request #13467 from Putnam3145/past-me-idiot
Fixes vore prefs (I was looking in the wrong place the whole time)
2020-10-01 03:10:04 -07:00
silicons 38c25bdc9d Merge pull request #13466 from Putnam3145/sdgf-fix
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
silicons bb09acff4c Merge pull request #13463 from timothyteakettle/slime-sprites
adds luminescent and stargazer sprites as selectable body sprites for slimes
2020-10-01 03:06:41 -07:00
silicons f8bd6d3f49 Merge pull request #13458 from lolman360/plumbingfix3
smoke machine/autoharvest hydro tray fix
2020-10-01 03:06:19 -07:00
silicons ebcbe7e901 Merge pull request #13431 from EmeraldSundisk/cargoclothes
Gives Cargo Technicians the choice of longer trousers.
2020-10-01 03:03:41 -07:00
silicons b7650f3dea Merge pull request #13398 from timothyteakettle/wound-config
wound config values, wound bonus for how damaged a limb is
2020-10-01 03:02:35 -07:00
silicons 8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
silicons 46a80af956 Merge pull request #13317 from LetterN/what-if-the-savefile-itself-is-teakproof-questionmark_charachter
Ports tgstation/tgstation#52549
2020-10-01 02:56:39 -07:00
Ghom 7f08969f48 Merge pull request #13457 from SandPoot/master
Fixes not getting an action button.
2020-10-01 11:44:22 +02:00
The0bserver fc3feae4c5 Plumbing component removed, for now. 2020-10-01 05:43:09 -04:00
Ghom a2597a4d84 Merge pull request #13448 from Tupinambis/spelling
Fixes a spelling error in an armor value that caused runtimes.
2020-10-01 11:42:55 +02:00
Putnam3145 22ca31e7d4 Merge pull request #13422 from Citadel-Station-13/species_slowdown_fix
Fixes angels not being fast while flying
2020-10-01 02:40:18 -07:00
Putnam3145 50894bc627 Merge pull request #13454 from Citadel-Station-13/silicons-patch-6
fixes botany harvest causing attack hand to runtime
2020-10-01 02:39:38 -07:00
The0bserver 5a03688bdb Dirt not powered, var cleanup, plumbing enable 2020-10-01 04:43:02 -04:00
The0bserver 48df6a9494 I shot the tray, I made an accurate tip. 2020-10-01 04:07:16 -04:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Tupinambis 67825fef74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into CarbonHydrogenBromine 2020-09-30 19:21:21 -05:00
timothyteakettle 27c5897c4d update button icon and stand up 2020-10-01 00:17:17 +01:00
Timothy Teakettle 16735e0190 silent paralysis 2020-09-30 21:40:42 +01:00
Timothy Teakettle 6b46fdbc32 fine 2020-09-30 21:16:09 +01:00
Timothy Teakettle 7cab2c658d Merge branch 'master' into slime-puddle 2020-09-30 18:43:25 +01:00
Timothy Teakettle 2223cfeb28 better 2020-09-30 18:41:30 +01:00
silicons 9f3b456583 Merge pull request #13416 from BlueWildrose/slimenoises
Unique slimeperson screams and laughter, and adds new customizable speech verbs
2020-09-30 09:22:25 -07:00
Putnam c644495e5e dodgin bullets 2020-09-29 21:07:41 -07:00