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
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
b671384015
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-15 08:23:48 -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
08bba425e4
run in a straight line to win gamemode lol
2019-08-12 19:42:58 -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
3b5600b81d
Merge pull request #9092 from Sishen1542/emp-beacons
...
crew combat mechs are now spawned in with a tracking beacon
2019-08-11 10:00:36 -07:00
a576e71a01
Merge pull request #9101 from Sishen1542/stealthy-surgery
...
obfuscates specific surgeries, gives generalized areas to anybody in viewing range
2019-08-11 09:59:29 -07:00
3e2f35b96c
nyoom
2019-08-11 04:04:01 -04:00
23d4b9827d
fix, yadda yadda
2019-08-11 01:19:37 -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
2b2bdb37ba
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 23:26:20 -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
d496e16dde
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 19:14:41 -05:00
234d058cc2
Update mecha_control_console.dm
2019-08-10 07:28:35 -04:00
40b89f49cc
Merge pull request #9078 from kappa-sama/moth1
...
Changes teleporter machines to apply flyperson (more) equally
2019-08-09 22:22:29 -07:00
b3b22029a6
Merge pull request #9064 from cebutris/hugloves
...
Hugs of the North Star
2019-08-09 22:20:18 -07: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
b8907c2f97
fixing what i forgot to do
2019-08-09 13:47:36 -04: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
4ba3d851ed
IT JUST WORKS
2019-08-09 00:46:14 -04:00
ee57720ee3
underwear colors fix 2: The revenge of the crunch.
2019-08-09 05:11:12 +02:00
f76bb27127
Fixes some runtimes and removes a holodeck exploit
...
and a cleanup >.>;
2019-08-08 21:33:42 -05: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
a8e4ce1f77
Merge branch 'master' into moth1
2019-08-08 18:27:34 -04:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
a7287ed4d1
Merge branch 'moth1' of https://github.com/kappa-sama/Citadel-Station-13 into Ghommie-cit185
2019-08-08 23:11:58 +02:00
a9eeb28fff
Uncalibrated teleporters can now turn furries, scalies & co into flypeople too.
2019-08-08 21:09:11 +02:00
2dc15b3fc0
Update teleporter.dm
2019-08-08 15:05:48 -04:00
290dfb8bbd
Merge pull request #9071 from YakumoChen/cloningnerf
...
Nerfs Autocloning
2019-08-08 02:00:37 -07:00
Poojawa