d283cd1b4b
Merge pull request #10317 from datlo/advancedmimery
...
Adds the advanced mimery kit to mime uplink
2018-11-25 08:51:31 +08:00
24ace06513
Merge pull request #10324 from granodd/ReagentScannerUpgrade
...
The Old Mass Spectrometer is Dead, Long Live the Reagent Scanner
2018-11-25 08:38:29 +08:00
4b1ee1eeb6
Removing the mass spectrometer and replacing it with the reagent scanner.
2018-11-23 19:48:18 -05:00
ad03363936
stopped random potentially picking a discount after its been bought
...
Fixed a very unlikely to occur bug, also got rid of old code that served no purpose.
2018-11-23 21:37:28 +00:00
3bf5c482ce
Small changes and merged with master following some recent additions to uplink items
...
Keeping it updated alongside master.
2018-11-23 12:03:59 +00:00
c8fbdd4b42
Merge remote-tracking branch 'upstream/master' into discounts
2018-11-23 11:33:08 +00:00
eeb447d424
spelling
...
oof
2018-11-23 08:06:04 +00:00
a80efa4924
Add the advanced mimery kit to mime uplinks
...
Also adds :
Mime specific spellbooks
TG wizard forcewall (mime is a subtype, will implement for wiz later
probably)
Fake finger gun spellbook in arcade
2018-11-23 07:23:34 +00:00
80ddd0e8a3
Merge pull request #10303 from AzuleUtama/syndiecigsMaintloot
...
Add Syndicate Cigarettes to Maintenance Loot
2018-11-22 19:20:54 +08:00
b2ce6e5829
Merge pull request #10300 from AlAtEX/IPC-repair
...
Adds a Medkit for IPCs
2018-11-22 11:53:11 +08:00
214cf7b12e
Merge pull request #10288 from datlo/basicsofCQC
...
Snake, try to remember some of the basics of CQC.
2018-11-22 08:53:26 +08:00
e6740168d9
Added machine first aid kit code
2018-11-21 18:14:40 -05:00
c2be8936eb
Revert
2018-11-21 15:59:39 -05:00
9f0c127d9a
Add syndi cigs to maint loot
...
Since an item classed as legal can only be gotten on the uplink right now.
2018-11-21 11:21:24 +00:00
bbba753001
Update boxes.dm
2018-11-20 21:04:49 -05:00
609d429233
Got things working properly... ish
2018-11-21 00:00:17 +00:00
fca03ff254
Merge pull request #10032 from variableundefined/SqueakComponent
...
Add in squeak component & refactor bikehorn, mouse to use it.
2018-11-20 18:38:42 -05:00
65286d7830
Adds the CQC manual to nukie uplinks
2018-11-20 03:51:52 +00:00
7b2ad525e4
Fixes runtime in syndieteam radio.
2018-11-20 04:49:03 +01:00
2d6bb70729
Discounts!
...
LET'S GO SHOPPING!
2018-11-19 19:01:46 +00:00
a4b600407c
Merge pull request #10274 from Birdtalon/safepatch
...
Fixes safe runtime upon deletion
2018-11-19 22:43:09 +08:00
b195aa5fa1
removes if statement adds return
2018-11-19 14:04:51 +00:00
765983a303
Merge pull request #10278 from KasparoVy/flame_on
...
Amends Plasma Statue Logging & Projectile Ignite Requirements
2018-11-19 15:42:06 +08:00
3f060e034e
Merge pull request #10253 from Kyep/cc_contraband
...
CC/Admin Outfits Update
2018-11-19 11:05:12 +08:00
715286421a
Amends Plasma Statue Logging & Projectile Ignite Requirements
...
Can't ignite a statue with a disabler anymore.
Brings the logging on par with that of welding tanks.
2018-11-18 20:47:25 -05:00
0a115cbcc3
fixes safe runtime upon deletion
2018-11-18 16:40:39 +00:00
45435169f5
Fixes anonymous syndicate borg radio.
2018-11-17 08:11:43 +01:00
ef3a2ce9c5
Adds in missing stub signals
2018-11-17 09:26:13 +08:00
d0a64445eb
soup flasks
2018-11-16 09:34:57 -08:00
070c349a81
fixes merge conflict in boxes.dm
2018-11-16 09:00:30 -08:00
2063795224
revert/fix jacket, CC pinpointer, re-add dark lord, greytide toolbox
2018-11-16 08:47:45 -08:00
2f26dc1d11
Merge pull request #10242 from Certhic/radiochannels
...
refactor radio magic numbers
2018-11-16 23:51:53 +08:00
e3f852dff6
magic numbers
2018-11-16 15:32:49 +01:00
d9383577f3
Fixes the passive effects of prayer beads and prayer bread.
2018-11-15 09:40:09 +01:00
a96475e2c6
Fixes infinite roller beds for borgs.
2018-11-14 06:23:08 +01:00
5c72537d8c
Fixes merge conflicts
2018-11-14 09:21:21 +08:00
45506e6d19
runtime fix
2018-11-13 17:09:57 +01:00
ec83e5c1f0
Update radio.dm
2018-11-12 12:19:36 -03:30
99de04db94
use human mob's voice instead of name.
2018-11-12 12:11:38 -03:30
8ad25400ea
Fixes description text errors in booger cocktail and in feral cat grenade
...
Slightly changed text of booger cocktail's description to stop it creating a hyperlink in the chat window that went nowhere. Updated feral cat grenades stating they spawned 8 cats in the uplink and item description when they actually spawn 5.
2018-11-11 19:13:53 +00:00
5a62f8ac07
Merge pull request #10179 from Eniraz/fulltile-plasma-windows-and-large-boxes
...
Fulltile plasma windows and large boxes
2018-11-11 15:09:35 +08:00
6f4be29ff0
Merge pull request #10190 from AzuleUtama/cyborgStunBaton
...
Fixed Borgs being able to continually use batons when out of power
2018-11-11 15:08:05 +08:00
6105639f69
Merge pull request #10166 from tigercat2000/updateicons
...
/tg/ human update_icons & ear organs
2018-11-11 12:09:30 +08:00
df053924f1
Removed a pointless return
...
Put a unique examine text for borgs in its place as originally intended.
2018-11-11 01:55:03 +00:00
02281c826f
Merge pull request #10177 from farie82/boxes
...
Added new box sprites props to Shazbot for the sprites
2018-11-10 12:43:29 -08:00
ed7477c37e
Fixed Borgs being able to continually use batons when out of power
...
Borgs will now have their batons deactivate when they are too lower on power and cannot turn it back on until they recharge. Also removed the charge percentage examine text when using a baton as a borg otherwise it would always tell you it was 100% charged.
2018-11-10 14:08:32 +00:00
202ba8b5ed
Forgot ERT, moved the boxes to boxes.dm
2018-11-10 12:08:06 +01:00
6fea41482f
Merge pull request #10157 from TDSSS/ai-quarantine
...
Make quarantine its own lawset.
2018-11-10 11:40:19 +08:00
172102a51a
Added new box sprites
...
Props to Shazbot for the sprites
2018-11-09 19:33:35 +01:00
c44b0fe732
gives a somewhat more reasonable integrity value to plastitanium windows
2018-11-09 17:23:11 +01:00
variableundefined