Commit Graph
7135 Commits
Author SHA1 Message Date
Mithrandalf 58033afc8a changes the code to be not as snowflake 2018-12-29 21:07:21 +00:00
Mithrandalf 5dae4072ab put in the brackets to fix the cluimsy thing 2018-12-29 20:34:00 +00:00
Mithrandalf 3f53b2448d Merge branch 'master' into toycuffs
maybe fixing things?
2018-12-29 20:15:23 +00:00
datlo b6627aaf1b fixed glowsticks on old station
removed emergency glowsticks from random
2018-12-29 16:39:58 +00:00
datlo 76cb5dd3bc Fix glowsticks not processing fuel, made a subtype of flare 2018-12-29 16:02:42 +00:00
variableundefinedandGitHub 20e3fbefaf Merge pull request #10532 from Spartan6/glowsticks
Adds emergency glowsticks
2018-12-29 17:33:23 +08:00
Mithrandalf a0c9724d28 Update toys.dm 2018-12-28 20:13:09 +00:00
Mithrandalf 1fa290ece4 all the new stuff 2018-12-28 15:42:07 +00:00
variableundefinedandGitHub bba96abd60 Merge pull request #10508 from Spartan6/ert-tweaks
Few ERT Tweaks
2018-12-28 20:47:11 +08:00
variableundefinedandGitHub c5fbc803d6 Merge pull request #10506 from improvedname/Syndicate-toolbox
Adds a recipe, that allows making syndicate toolboxes
2018-12-28 20:46:31 +08:00
variableundefinedandGitHub d1a31f22ca Merge pull request #10509 from improvedname/Request
Adds a syndicate emergency box
2018-12-28 20:46:16 +08:00
Spartan6 a7dfd41335 Adds better glowstick and flare usage sounds. 2018-12-27 23:35:59 +00:00
Spartan6 73a75eb589 Adds emergency glowsticks 2018-12-27 23:03:10 +00:00
TDSSS 95905e94a3 fixed clumsy handcuff interaction 2018-12-27 22:09:24 +01:00
Mithrandalf a4df95add6 removes pointless comment that I somehow missed
I'm a dum dum
2018-12-27 20:21:36 +00:00
Mithrandalf ac2d3396d6 Removes redundancies, makes exception for clumsiness 2018-12-27 20:20:19 +00:00
Mithrandalf 0e9191cdd4 Adds the cuffs to the code and the map 2018-12-27 17:01:40 +00:00
Spartan6 1af3259a9c Added advanced analyser instead to medical bag, tweaked grammar on surgery belt and renamed Chief Engineer's toolbelt to advanced toolbelt. 2018-12-26 00:21:51 +00:00
NickandGitHub a52f49ca2f Update toolbox.dm 2018-12-26 00:18:37 +01:00
NickandGitHub fecc67285d Update boxes.dm 2018-12-25 23:24:42 +01:00
Improvedname 4b66dc63fe SyndiLYNDIE 2018-12-25 22:57:45 +01:00
Shadow-QuillandGitHub b6f8b5674c Get fresh hot returns here 2018-12-25 14:36:54 -06:00
Improvedname cdc5ae5017 push 2018-12-25 19:50:44 +01:00
Ranged 550e2300f9 Fixed flashbang container interaction 2018-12-24 19:49:36 +01:00
variableundefinedandGitHub 65ca04f05d Merge pull request #10450 from datlo/toxinstechdisk
Add toxins technology research and the Bluespace RPD
2018-12-24 09:20:52 +08:00
variableundefinedandGitHub 24ebcda6c4 Merge pull request #10474 from datlo/syndicateremap2
Adds Syndi Officer admin job and remaps SST/SIT starting areas 2
2018-12-24 09:17:15 +08:00
AffectedArc07andGitHub fbd31bd46a Merge branch 'master' into emitter-reflectors 2018-12-23 23:26:47 +00:00
AffectedArc07 3ba1837c9f Adds reflectors 2018-12-23 23:07:01 +00:00
datlo 6fe32ee6ae Add shrapnel to frag grenades 2018-12-19 07:49:05 +00:00
datlo b0f60602a8 MERGE SHIT REEEEE IMMAH PUNCH A WALL 2018-12-18 11:47:29 +00:00
datlo 47664f404b frag grenades do not breach, have more radius 2018-12-18 04:12:09 +00:00
datlo 987a670b76 remove implied src, change beakers in facid grenades 2018-12-18 02:04:35 +00:00
datlo d0ea5d0e97 fix facid grenade naming 2018-12-17 22:36:31 +00:00
datlo 1e9e6c7c6b fix weird spacing? 2018-12-17 12:15:16 +00:00
datlo 3f2804c8bf adds the grenadier belt and permafrost'd tiles 2018-12-17 11:53:28 +00:00
Aurorablade 86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
variableundefinedandGitHub c011c0ad2f Merge pull request #10441 from datlo/boxsprites
Add sprites to specie specific boxes
2018-12-15 18:15:52 +08:00
variableundefinedandGitHub 0c134f19b8 Merge pull request #10389 from Edefff/Fix-cigarette-chem-consumption
Fix cigarette chem consumption
2018-12-13 23:08:54 +08:00
variableundefinedandGitHub 16a064d1e6 Merge pull request #10422 from Kyep/depot_update_4
Depot Update
2018-12-13 23:06:29 +08:00
variableundefinedandGitHub 3571c7d157 Merge pull request #10424 from Mitchs98/sushi
Adds Sushi Mat and Sushi Makiroll
2018-12-13 23:01:06 +08:00
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
variableundefinedandGitHub 07769ba3b9 Merge pull request #10438 from Aurorablade/BirdisnotbirdisnotBIRD
Trying to Diagnose rsc issues
2018-12-12 13:28:55 +08:00
datlo 5651009eb5 add sprites to specie specific boxes 2018-12-11 14:48:55 +00:00
variableundefinedandGitHub 44414201f4 Merge pull request #10399 from Darkmight9/Nanopaste_Overheal
Gives Nanopaste overheal
2018-12-11 21:29:10 +08:00
variableundefinedandGitHub 9e5deff65e Merge pull request #10409 from AzuleUtama/uplinkSearch
Uplink - Collapsible Categories and Layout Tweaks
2018-12-11 20:45:45 +08:00
variableundefinedandGitHub 7d33a49a30 Merge pull request #10433 from Kyep/singulo_warning
Clarifies BoH/BoH warning
2018-12-11 20:38:59 +08:00
variableundefinedandGitHub 10da4f2436 Merge pull request #10431 from Tails2091/random_items
random_items Cleanup
2018-12-11 20:29:55 +08:00