Commit Graph
5544 Commits
Author SHA1 Message Date
Poojawa b29607c019 It's working again, I guess. wtf 2019-08-21 01:36:59 -05:00
Poojawa 23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa 96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05:00
Sishen 7a8e2c3f50 rebalances the lawyer heirloom briefcase while giving it a fancy new sprite 2019-08-19 17:54:16 -04:00
Sishen ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
TrilbyspacecloneandGitHub d1404a84d8 Update backpack.dm 2019-08-19 07:03:54 -04:00
Poojawa cede93299e REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 2019-08-19 04:48:37 -05:00
kevinz000andGitHub 3f734d9aca Merge pull request #8763 from Trilbyspaceclone/patch-188
Reblances bone satchles
2019-08-18 23:39:39 -07:00
kevinz000andGitHub 3ef29bbbeb Merge pull request #9097 from lolman360/durathread
Adds durathread.
2019-08-18 23:37:07 -07:00
TrilbySpaceClone 2b08b97f1d yay 2019-08-17 23:54:50 -04:00
Poojawa 2eac1b6ca2 Everything's working again, for now. 2019-08-17 08:04:18 -05:00
Poojawa 2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
Poojawa 725a8046e1 just need items to actually have their overlays, ree 2019-08-17 04:50:24 -05:00
Poojawa 088bc484e3 Forensics re-destroyed, but better this time.
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
TrilbyspacecloneandGitHub 906e7a1bd8 Update backpack.dm 2019-08-17 00:25:40 -04:00
lolman360andGitHub ae2ccb2686 should be done now 2019-08-17 12:20:37 +10:00
lolman360andGitHub 7d12535ead thanks paxxy boi 2019-08-17 12:18:18 +10:00
lolman360andGitHub e838da8039 Merge pull request #3 from Citadel-Station-13/master
3
2019-08-17 11:55:56 +10:00
Poojawa 8bd54bcc54 I'm just waiting for a better idea before dumping this hot garbage again 2019-08-16 06:24:42 -05:00
Poojawa c3fb13c140 meh. 2019-08-16 05:10:55 -05:00
Poojawa d71f37167f I'm about to go fucking APE
None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm
2019-08-16 04:58:16 -05:00
Poojawa 264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa 0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Sishen 6fab91046d Update misc.dm 2019-08-15 13:04:28 -04:00
Poojawa 2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
Winter Flare 04c302b08e Service Tweaks
Makes the Janibelt a bit more useful by expanding its limited pool of allowed items. Beakers and Bottles for carrying additional space cleaner/ammonia/water.

Allows the plant DNA maniuplator to be wrenched and moved.
2019-08-15 06:28:46 -04:00
Sishen ad91152c83 Update misc.dm 2019-08-14 17:08:33 -04:00
Sishen f6baaf8c58 honk honk 2019-08-14 17:06:58 -04:00
Sishen 3281f23eb6 made changes as per bhijns request 2019-08-14 16:30:54 -04:00
Winter Flare 141a93236c Service QoL
-Adds the Pimpin' Ride to the Custodial Locator Cartridge.
-Makes additional Pimpin' Rides orderable through cargo.
-Moves Light Replacer from power_designs to misc_designs and properly places it in equipment (where all other advanced sanitation research items appear.)
2019-08-14 04:01:18 -04:00
kevinz000andGitHub a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
2019-08-11 10:15:49 -07:00
kevinz000andGitHub 123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00
Sishen 3e2f35b96c nyoom 2019-08-11 04:04:01 -04:00
lolman360andGitHub b283a0979c yay 2019-08-11 14:56:42 +10:00
lolman360andGitHub e2e7133eba ew things are called different things 2019-08-11 14:54:17 +10:00
Poojawa dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
BlackMajorandGitHub 5dcd419d8a Merge pull request #8356 from Thalpy/master
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
2019-08-11 16:09:23 +12:00
lolman360andGitHub 22b461c78f Merge pull request #1 from lolman360/master
d
2019-08-11 12:00:55 +10:00
lolman360andGitHub e4a9f2743b and gitbabby 2019-08-11 11:14:07 +10:00
lolman360andGitHub aa71a39fa8 so basically im monky 2019-08-11 11:13:38 +10:00
lolman360andGitHub 2c1add5276 all my other comimits were to master 2019-08-11 11:13:02 +10:00
lolman360andGitHub f131104a73 Add files via upload 2019-08-11 10:51:38 +10:00
kevinz000andGitHub 74008beb8f Merge pull request #9066 from Ghommie/Ghommie-cit181
Two lines fixes for invisible zipties and borked legcuffs.
2019-08-09 22:17:31 -07:00
kevinz000andGitHub 14033d9876 Merge pull request #9085 from Ghommie/Ghommie-cit186
underwear colors fix 2: The revenge of the crunch.
2019-08-09 22:15:55 -07:00
Fermi 02b5100be7 Made scans advanced. 2019-08-09 13:01:14 +01:00
Fermi 6e0303fdba Actual fix for #9091 2019-08-09 12:48:26 +01:00
Fermi 34cfd2c1e3 Fix for #9091 2019-08-09 12:12:25 +01:00
Sishen c6fbb966c8 honk 2019-08-09 03:55:08 -04:00
Sishen dc66446064 dab dab 2019-08-09 03:19:02 -04:00
Ghommie ee57720ee3 underwear colors fix 2: The revenge of the crunch. 2019-08-09 05:11:12 +02:00