Commit Graph

19367 Commits

Author SHA1 Message Date
variableundefined
db26f9bcc4 Merge pull request #10892 from UmeFuu/master
New cookies recipe (previous one was a bit silly)
2019-02-26 17:04:31 +08:00
variableundefined
2ddc16970c Merge pull request #10947 from Fox-McCloud/adds-upgraded-heart
Adds Upgraded Cybernetic Heart
2019-02-26 17:01:50 +08:00
variableundefined
3e1e196dd0 Merge pull request #10911 from farie82/Beepsky-use-doafter
Beepsky now uses do after
2019-02-26 16:36:27 +08:00
Fox McCloud
dbd5119543 Mutagen Fix 2019-02-25 20:29:29 -05:00
UmeFuu
51a33bba08 Changes some code
From "for(var/i = 1, i <= created_volume, i++)" to "the for(var/i in 1 to created_volume)" on lines 102 & 117 in order to make it more understandable
2019-02-25 22:16:38 -03:00
UmeFuu
de86d56285 Deletes leftover code 2019-02-25 21:58:46 -03:00
UmeFuu
07b1b319e8 Adds/del some spacings where needed 2019-02-25 21:57:39 -03:00
variableundefined
8266a732bf Merge pull request #10885 from datlo/freegolemtweaks
Free Golems tweaks
2019-02-26 08:43:47 +08:00
variableundefined
356feaca7d Merge pull request #10944 from Kyep/ts_princess_and_white_update
Terror spider princess and white update
2019-02-26 08:10:26 +08:00
variableundefined
e580c4f25a Merge pull request #10946 from Fox-McCloud/capulettium-tweak
Capulettium Tweak
2019-02-26 08:08:36 +08:00
variableundefined
d800523af3 Merge pull request #10941 from Fox-McCloud/virology-balance
Re-Balances Virology
2019-02-26 08:08:16 +08:00
variableundefined
9d66e0e426 Merge pull request #10932 from Ralta/ianshield
Adds Blueshield Beret to Ian clothing
2019-02-26 08:06:35 +08:00
variableundefined
1a04e434eb Merge pull request #10936 from Fox-McCloud/stable-mutagen
Adds Stable Mutagen
2019-02-26 08:06:20 +08:00
Fox McCloud
71a48d803b nope 2019-02-25 01:32:02 -05:00
Fox McCloud
b8a9f127bf Adds Upgraded Cybernetic Heart 2019-02-25 01:15:53 -05:00
Fox McCloud
146f8d37dc description tweak 2019-02-24 16:52:00 -05:00
Fox McCloud
347a14aad8 Capulettium Tweak 2019-02-24 16:31:42 -05:00
variableundefined
c85d8b92fd Merge pull request #10870 from datlo/syndiborgupload
Allow nuclear operatives to upload their mind into spawned cyborgs
2019-02-24 21:05:22 +08:00
Kyep
bd10bbe3ad new infection functionality 2019-02-23 23:41:50 -08:00
Kyep
c631f6b9cb updates name of black terror venom 2019-02-23 23:25:22 -08:00
Kyep
69327008fd fix bug where princess name did not update 2019-02-23 23:25:10 -08:00
Kyep
1d95c8fce7 replace mother with princesses in infestation events 2019-02-23 23:24:55 -08:00
variableundefined
09e2b9fb5b Merge pull request #10923 from datlo/canthavenicethings
Prevent golems from using telescience consoles
2019-02-24 11:59:31 +08:00
variableundefined
33fbced3dc Merge pull request #10919 from Fox-McCloud/compact-sniper-rifle
Adds Compact Sniper Rifle to Uplink
2019-02-24 07:52:04 +08:00
Fox McCloud
182177f6eb grammar/wording 2019-02-23 18:17:21 -05:00
datlo
fbf58ffafd remove unnecessary srcs 2019-02-23 19:25:31 +00:00
Fox McCloud
97c9817d85 Re-Balances Virology 2019-02-22 18:49:16 -05:00
Fox McCloud
a24c8d2c25 Adds Stable Mutagen 2019-02-21 19:40:14 -05:00
Ralta
3ae3fae026 Added Blueshield armor sprite, allows Ian to wear Blueshield vest 2019-02-21 01:04:19 +00:00
Ralta
7a7dcf29c9 Adds Blueshield Beret to Ian clothing
Allows Ian to wear the Officer's Beret and the Navy Blue Officer's Beret in order to become Blueshield Ian, protector of Command and biter of ankles.
2019-02-20 23:16:01 +00:00
datlo
bb3e3ffd2b updated denied message 2019-02-19 21:25:58 +00:00
variableundefined
abe80802f7 Merge pull request #10913 from datlo/nogolemassassinate
Prevent objectives from targeting offstation roles
2019-02-19 22:15:11 +08:00
variableundefined
73db68276f Merge pull request #10891 from Citinited/conveyor-switch-tweak
Using a multitool on a conveyor lever no longer opens a menu
2019-02-19 19:07:26 +08:00
joep van der velden
e44cab464d invoke_async then 2019-02-18 21:12:14 +01:00
datlo
c8d108f662 Prevent golems from using telescience consoles 2019-02-18 19:30:16 +00:00
Arkatos1
2fb13ef034 Changed Aurora Caelus header when event is ending 2019-02-17 14:29:27 +01:00
Fox McCloud
bb3f2266cf Adds Compact Sniper Rifle to Uplink 2019-02-17 03:32:10 -05:00
variableundefined
f27f73e15b Merge pull request #10916 from Nicaragua1/General_Griefsky
fix secbots construction names
2019-02-17 12:40:10 +08:00
Nicaragua
6d40ca21d1 honkbot not dropping oil 2019-02-16 20:11:16 -03:00
Nicaragua
089c5a50ba return parent 2019-02-16 19:35:56 -03:00
Nicaragua
8f8faeeb93 fix name 2019-02-16 19:31:11 -03:00
variableundefined
8689bc4437 Merge pull request #10901 from aleksix/ai-cryo-fix
AI's Wipe Core now properly ghosts the player
2019-02-17 06:30:52 +08:00
lass9030
9075ede986 update to disc link alert text 2019-02-16 23:19:24 +01:00
xerdies
f7cac39aa5 Initial fix. 2019-02-16 18:54:47 +00:00
datlo
91792b09c1 Prevent objectives from targetting offstation roles
also remove nukie flavor text and prevent golem targetting
2019-02-16 15:09:25 +00:00
joep van der velden
29b20ec201 Beepsky now uses do after 2019-02-16 12:34:13 +01:00
variableundefined
f6ce6af91e Merge pull request #10898 from Mitchs98/booze
Booze/Soda Dispenser Changes.
2019-02-16 18:42:43 +08:00
variableundefined
4521747046 Merge pull request #10750 from Nicaragua1/General_Griefsky
General Griefsky
2019-02-16 18:41:35 +08:00
variableundefined
292b43d563 Merge pull request #10897 from Terilia/DonkSniper
Donksoft's new product - The Donksoft Sniper Rifle - Purchase Now! (Ages 8 and up)
2019-02-16 07:37:17 +08:00
xerdies
608d6f09c5 added ammo boxes, and added them to the materials so they can be printed. 2019-02-15 21:11:19 +00:00