Commit Graph

8176 Commits

Author SHA1 Message Date
Trilbyspaceclone
3e4412e171 Delete autolathe_designs.dm 2019-05-12 02:04:07 -04:00
Trilbyspaceclone
62e5037eab Merge branch 'master' into patch-118 2019-05-12 02:03:32 -04:00
Trilbyspaceclone
db74544a7c Create autolathe_designs.dm 2019-05-12 02:02:49 -04:00
kevinz000
9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key
Better Locked Collar checks
2019-05-11 22:21:16 -07:00
kevinz000
4f12a762f3 Merge pull request #8342 from BurgerLUA/Cult-Improvements-and-Fixes
Adds EMP Defensive Traps to Clockcult
2019-05-11 22:19:46 -07:00
kevinz000
db99b595f3 Merge pull request #8331 from Useroth/dick-circuits
Dildo-shaped circuit assemblies. Because that's what the community needs.
2019-05-11 22:17:46 -07:00
kevinz000
36ee078e23 Merge pull request #8333 from Useroth/ayy-baton
Abductor baton buff. Because it currently sucks balls.
2019-05-11 22:17:27 -07:00
kevinz000
86e3992945 Merge pull request #8335 from Poojawa/quick-fiiiix-marking
Quick fiiiix marking
2019-05-11 22:16:37 -07:00
kevinz000
9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding
Satchel of Holding!
2019-05-11 22:14:15 -07:00
kevinz000
4276f53338 Merge pull request #8341 from Trilbyspaceclone/golden
Golden toolboxes.
2019-05-11 22:13:18 -07:00
Trilbyspaceclone
2833dab538 le sigh 2019-05-11 14:49:51 -04:00
Trilbyspaceclone
460459a1dd Update craft.dm 2019-05-11 14:08:43 -04:00
Trilbyspaceclone
1f1926a70e Create machine_designs_all_misc.dm 2019-05-11 12:26:56 -04:00
Trilbyspaceclone
f47c0786f3 Add files via upload 2019-05-11 11:42:31 -04:00
Trilbyspaceclone
172d56ace5 Add files via upload 2019-05-11 11:41:56 -04:00
Trilbyspaceclone
3a12bab370 Delete machine_designs.dm 2019-05-11 11:41:20 -04:00
Trilbyspaceclone
034a9a0865 Delete comp_board_designs.dm 2019-05-11 11:41:10 -04:00
BurgerLua
f66326ab51 Fixes an potential AI exploit. 2019-05-10 19:19:42 -07:00
BurgerLua
4aba11739b Finishing touches. 2019-05-10 19:15:42 -07:00
BurgerLua
d97bf47b95 Added 2019-05-10 18:12:36 -07:00
Trilbyspaceclone
af7b7fc638 Update autolathe_designs_medical_and_dinnerware.dm 2019-05-10 16:48:52 -04:00
Trilbyspaceclone
2885330459 commit die 2019-05-10 16:30:39 -04:00
Trilbyspaceclone
a703b8b85f Yep this works 100% no errors at all! 2019-05-10 16:30:01 -04:00
Trilbyspaceclone
86e5d96679 Update uplink_items.dm 2019-05-10 14:55:46 -04:00
Trilbyspaceclone
651a452ed0 Update recipes.dm 2019-05-10 14:50:44 -04:00
Scorpion-117
7a8adff8e0 testing a value of 7
x
2019-05-10 01:58:53 -06:00
Scorpion-117
9fd61b660d modifying to make it take far more power to produce
x
2019-05-10 01:55:25 -06:00
BurgerLua
8b935b9abf Reverts cooking change, adds safety checks. 2019-05-09 21:10:44 -07:00
Sishen
c3df1b354e Satchel of holding
fashion creep
2019-05-09 20:44:07 -04:00
BurgerLua
6df27ef2a3 Updated integrated circuits 2019-05-09 15:25:48 -07:00
Poojawa
28eb23d474 Fixes prosthetics and missing markings 2019-05-09 16:15:03 -05:00
Useroth
a0d948497b Totally forgotten the abductor adrenals. 2019-05-09 13:28:04 +02:00
Useroth
83661fff9d Update abduction_gear.dm 2019-05-09 13:17:12 +02:00
Useroth
07685a1074 Abductor baton buff. Because it currently sucks balls. 2019-05-09 12:20:02 +02:00
Useroth
4355584833 Added them to loadout too. 2019-05-09 12:09:18 +02:00
Useroth
abe8ed16cb A small touch-up. 2019-05-09 11:38:33 +02:00
Useroth
1efd7123f2 Two new collar types. All collars are now colorable a'la polychromic stuff. 2019-05-09 11:22:51 +02:00
Useroth
b80bb21219 Dildo-shaped circuit assemblies. Because that's what the community needs. 2019-05-09 08:45:47 +02:00
Scorpion-117
e8299db245 Readding stargazer 2019-05-08 07:44:39 -06:00
Scorpion-117
0c6d84d50e Reading stargazers
because why not
2019-05-08 07:29:50 -06:00
Scorpion-117
d0970e327c Update stargazer.dm 2019-05-08 07:21:17 -06:00
Scorpion-117
c0717561ff puts back stargazer DM
x
2019-05-08 07:20:29 -06:00
kevinz000
a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer
Makes a new COMBAT inducer! - Admin only
2019-05-08 01:34:33 -07:00
kevinz000
1e40a65536 buff this a bit 2019-05-08 01:31:00 -07:00
kevinz000
55d54592d5 Update toxin_reagents.dm 2019-05-08 01:30:24 -07:00
deathride58
2b1261ab03 Merge pull request #8284 from Citadel-Station-13/kevinz000-patch-44
adds sdql2 new()/instantiation call so it's easier to fill things with cream pies
2019-05-07 02:19:40 -04:00
Trilbyspaceclone
9adeccc5e1 Update autolathe_designs.dm 2019-05-06 23:47:39 -04:00
Trilbyspaceclone
ae75bf2fd1 Update autolathe_designs.dm 2019-05-06 23:46:31 -04:00
deathride58
f318ad7d1b Merge pull request #8278 from Trilbyspaceclone/patch-106
Buffs blob Shield armor, as well as weaken state
2019-05-06 22:13:50 -04:00
deathride58
5e2a9669d1 Merge pull request #8285 from Citadel-Station-13/kevinz000-patch-45
vent_clog event now respects vent welding
2019-05-06 22:08:43 -04:00