Commit Graph

4777 Commits

Author SHA1 Message Date
datlo
fde4faed76 Made tanks empty, remove unnecessary tank types and added toxins tech requirement to AEG and welding gas mask 2018-12-12 23:31:43 +00:00
datlo
0c8d8ffaa8 fixes
readded toxins tech requirement to BRPD design, i thought it was the
item itself derp
fixed a bug where BRPD wouldn't make a beam if you clicked pipes
directly
added a period for consistency
2018-12-12 22:51:38 +00:00
datlo
c1864de126 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into toxinstechdisk 2018-12-12 22:29:18 +00:00
datlo
5ef66ae01d Add bluespace RPD 2018-12-12 18:24:43 +00:00
variableundefined
07769ba3b9 Merge pull request #10438 from Aurorablade/BirdisnotbirdisnotBIRD
Trying to Diagnose rsc issues
2018-12-12 13:28:55 +08:00
variableundefined
44414201f4 Merge pull request #10399 from Darkmight9/Nanopaste_Overheal
Gives Nanopaste overheal
2018-12-11 21:29:10 +08:00
variableundefined
9e5deff65e Merge pull request #10409 from AzuleUtama/uplinkSearch
Uplink - Collapsible Categories and Layout Tweaks
2018-12-11 20:45:45 +08:00
variableundefined
7d33a49a30 Merge pull request #10433 from Kyep/singulo_warning
Clarifies BoH/BoH warning
2018-12-11 20:38:59 +08:00
variableundefined
10da4f2436 Merge pull request #10431 from Tails2091/random_items
random_items Cleanup
2018-12-11 20:29:55 +08:00
variableundefined
9e59827416 Merge pull request #10351 from Citinited/duct-tape-stick-tweak
You can stick duct tape to more than just paper now
2018-12-11 20:18:05 +08:00
variableundefined
a5d44ef87e Merge pull request #10322 from Birdtalon/speciesboxes
Speciesboxes; species specific starting boxes
2018-12-11 19:57:30 +08:00
Aurorablade
87f3a7c1b3 Caseing 2018-12-10 21:52:10 -05:00
Kyep
e204fd6638 Clarifies BoH/BoH warning 2018-12-08 19:44:28 -08:00
Tails2091
cf3025d7a8 random_items Cleanup 2018-12-08 18:33:46 -05:00
AzuleUtama
00c34f1935 Blocks job specific gear category for nukies, removed last of 'return' function uplink code, minor layout changes to template 2018-12-07 00:09:11 +00:00
AzuleUtama
d9215f3789 Made temp category start as null, cleaned up template code 2018-12-06 10:19:23 +00:00
Shadow-Quill
0a70c3549c Changed 'protocals' to 'protocols'
SPELLING WHEE
2018-12-05 10:59:52 -06:00
AzuleUtama
a578f9cef7 Uplink Category Search
Makes it so users can pick categories in the uplink
2018-12-05 16:02:51 +00:00
Darkmight9
dd5c18a8b4 Gives nanopaste overheal 2018-12-03 01:03:47 -05:00
Citinited
6354631937 Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted 2018-12-01 00:13:21 +00:00
variableundefined
00a0acb2ec Merge pull request #10340 from Kyep/chaplain_1
Chaplain tweaks
2018-11-29 14:22:03 +08:00
Kyep
a65f8b690b spacing 2018-11-28 19:38:09 -08:00
Kyep
b4acc30b2e removes alignment system 2018-11-28 19:23:26 -08:00
Citinited
88ff4eb49f Some fixes for taping, also bumps up max_amount for tape rolls and adds a tape supply pack 2018-11-28 22:21:59 +00:00
variableundefined
63490c8378 Merge pull request #10330 from tigercat2000/multilingual
Multilingualism
2018-11-28 10:48:19 +08:00
Kyep
c5a4abeb8b changes alignments to light/neutral/dark, removes atheism 2018-11-27 17:34:10 -08:00
Birdtalon
b5e506d40c adds species starting boxes 2018-11-27 12:42:43 +00:00
Kyep
4d5d97024b removes unnecessary spawn() 2018-11-26 15:29:44 -08:00
Kyep
032a8e00a5 sanctified nullrod hallelujah on pickup, once 2018-11-26 14:04:12 -08:00
Kyep
41062f46ad added hit sound for failed sanctified nullrod pickup 2018-11-25 16:56:38 -08:00
Kyep
a8ce5cdc2a adds sanctified red/gamma ERT nullrods 2018-11-25 16:18:32 -08:00
Kyep
77c244a91e fixes more cases of code snowflake 2018-11-25 15:32:07 -08:00
Citinited
05b9955f2b You can stick duct tape to more than just paper now 2018-11-25 23:03:10 +00:00
variableundefined
d283cd1b4b Merge pull request #10317 from datlo/advancedmimery
Adds the advanced mimery kit to mime uplink
2018-11-25 08:51:31 +08:00
variableundefined
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
Kyep
b50016891e removes all spells but bless, fixes bugs, adds holy torch 2018-11-24 14:07:21 -08:00
tigercat2000
e56750481c Multilingualism
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
2018-11-24 00:22:05 -08:00
Kyep
b139af2bdd v1 2018-11-23 20:08:49 -08:00
Granodd
4b1ee1eeb6 Removing the mass spectrometer and replacing it with the reagent scanner. 2018-11-23 19:48:18 -05:00
AzuleUtama
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
AzuleUtama
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
AzuleUtama
c8fbdd4b42 Merge remote-tracking branch 'upstream/master' into discounts 2018-11-23 11:33:08 +00:00
datlo
eeb447d424 spelling
oof
2018-11-23 08:06:04 +00:00
datlo
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
variableundefined
b2ce6e5829 Merge pull request #10300 from AlAtEX/IPC-repair
Adds a Medkit for IPCs
2018-11-22 11:53:11 +08:00
variableundefined
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
AlAtEx
e6740168d9 Added machine first aid kit code 2018-11-21 18:14:40 -05:00
AlAtEx
c2be8936eb Revert 2018-11-21 15:59:39 -05:00
Darkmight9
50dbd49530 This, hopefully, gives overheal to nanopaste or at least can be a staging point. This is my fisr time coding so advice and impute is aprecated. 2018-11-21 01:20:32 -05:00
Michael C
bbba753001 Update boxes.dm 2018-11-20 21:04:49 -05:00