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
264cbf8108
reverts the add_blood back to add_blood_DNA
2019-08-15 12:49:10 -05:00
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
6fab91046d
Update misc.dm
2019-08-15 13:04:28 -04:00
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05:00
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
ad91152c83
Update misc.dm
2019-08-14 17:08:33 -04:00
f6baaf8c58
honk honk
2019-08-14 17:06:58 -04:00
3281f23eb6
made changes as per bhijns request
2019-08-14 16:30:54 -04:00
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
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
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
3e2f35b96c
nyoom
2019-08-11 04:04:01 -04:00
b283a0979c
yay
2019-08-11 14:56:42 +10:00
e2e7133eba
ew things are called different things
2019-08-11 14:54:17 +10:00
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
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
22b461c78f
Merge pull request #1 from lolman360/master
...
d
2019-08-11 12:00:55 +10:00
e4a9f2743b
and gitbabby
2019-08-11 11:14:07 +10:00
aa71a39fa8
so basically im monky
2019-08-11 11:13:38 +10:00
2c1add5276
all my other comimits were to master
2019-08-11 11:13:02 +10:00
f131104a73
Add files via upload
2019-08-11 10:51:38 +10:00
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
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
02b5100be7
Made scans advanced.
2019-08-09 13:01:14 +01:00
6e0303fdba
Actual fix for #9091
2019-08-09 12:48:26 +01:00
34cfd2c1e3
Fix for #9091
2019-08-09 12:12:25 +01:00
c6fbb966c8
honk
2019-08-09 03:55:08 -04:00
dc66446064
dab dab
2019-08-09 03:19:02 -04:00
ee57720ee3
underwear colors fix 2: The revenge of the crunch.
2019-08-09 05:11:12 +02:00
12c4fc139d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-08-09 04:00:23 +02:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
ad7189a211
Merge pull request #9061 from deathride58/fuckfemurbreakers
...
Makes the femur breaker use the proper scream emote and makes the femur breaker guarantee the victim falls into crit
2019-08-08 01:59:51 -07:00
f59b60e83a
QOL OOGA BOOGA
2019-08-08 01:11:20 -04:00
23e3263fcb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
2019-08-08 04:46:54 +02:00
b5841c718b
Genpop for security
2019-08-07 06:14:35 -05:00
7391581a26
2 small fixes.
2019-08-07 11:33:53 +01:00
2a049e3485
Should fix the locker conflict! (untested)
2019-08-07 09:40:13 +01:00
2256bbb63c
Merge branch 'master' into master
2019-08-07 09:30:53 +01:00
de8137d6c8
One line fix for invisible zipties.
2019-08-06 23:19:28 +02:00
ee1b04eefb
Fixes potential "trapped as ghost" problems and examine+scanner text
2019-08-06 19:54:07 +01:00
ddb29551fc
paren
2019-08-06 11:28:01 -04:00
ee0d7a4ed3
Fixes issues with femur breaker by replacing the forced speech with a proper scream emote and making it guarantee landing in crit
2019-08-06 07:43:28 -04:00
decbd37ced
Update closets.dm
2019-08-06 03:49:08 -04:00
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
aea2f6f523
Merge pull request #8900 from Seris02/spaceruinsyee
...
Abductor Replication Lab space ruin - take 2
2019-08-05 00:55:40 -07:00
9ec56077b6
Merge pull request #8908 from Ghommie/Ghommie-cit142
...
Fixes Zelus flasks a bit.
2019-08-05 00:54:43 -07:00
b292bc7187
Merge pull request #9007 from Ghommie/Ghommie-cit168
...
Fixes and standarizes sword sheaths/scabbards overlays.
2019-08-05 00:49:49 -07:00
86a2d917e5
Merge pull request #8913 from Trilbyspaceclone/clockstoles
...
Makes brass/bronze bar stools and stools - Same as normal ones
2019-08-05 00:45:56 -07:00
9852084200
Merge pull request #9019 from Ghommie/Ghommie-cit172
...
Adds in a stereotypical vegetarian MRE. Tweaks the rest.
2019-08-05 00:44:15 -07:00
Poojawa