Commit Graph

631 Commits

Author SHA1 Message Date
datlo
76cb5dd3bc Fix glowsticks not processing fuel, made a subtype of flare 2018-12-29 16:02:42 +00:00
variableundefined
20e3fbefaf Merge pull request #10532 from Spartan6/glowsticks
Adds emergency glowsticks
2018-12-29 17:33:23 +08:00
variableundefined
bba96abd60 Merge pull request #10508 from Spartan6/ert-tweaks
Few ERT Tweaks
2018-12-28 20:47:11 +08:00
variableundefined
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
Spartan6
73a75eb589 Adds emergency glowsticks 2018-12-27 23:03:10 +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
Nick
a52f49ca2f Update toolbox.dm 2018-12-26 00:18:37 +01:00
Nick
fecc67285d Update boxes.dm 2018-12-25 23:24:42 +01:00
Improvedname
4b66dc63fe SyndiLYNDIE 2018-12-25 22:57:45 +01:00
Improvedname
cdc5ae5017 push 2018-12-25 19:50:44 +01:00
datlo
47664f404b frag grenades do not breach, have more radius 2018-12-18 04:12:09 +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
variableundefined
c011c0ad2f Merge pull request #10441 from datlo/boxsprites
Add sprites to specie specific boxes
2018-12-15 18:15:52 +08:00
variableundefined
16a064d1e6 Merge pull request #10422 from Kyep/depot_update_4
Depot Update
2018-12-13 23:06:29 +08:00
datlo
5651009eb5 add sprites to specie specific boxes 2018-12-11 14:48:55 +00:00
variableundefined
7d33a49a30 Merge pull request #10433 from Kyep/singulo_warning
Clarifies BoH/BoH warning
2018-12-11 20:38:59 +08:00
variableundefined
a5d44ef87e Merge pull request #10322 from Birdtalon/speciesboxes
Speciesboxes; species specific starting boxes
2018-12-11 19:57:30 +08:00
Kyep
e204fd6638 Clarifies BoH/BoH warning 2018-12-08 19:44:28 -08:00
Kyep
0d91b3b619 deletes trapped syndi toolbox 2018-12-06 19:13:56 -08:00
variableundefined
00a0acb2ec Merge pull request #10340 from Kyep/chaplain_1
Chaplain tweaks
2018-11-29 14:22:03 +08:00
variableundefined
63490c8378 Merge pull request #10330 from tigercat2000/multilingual
Multilingualism
2018-11-28 10:48:19 +08:00
Birdtalon
b5e506d40c adds species starting boxes 2018-11-27 12:42:43 +00: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
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
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
Michael C
bbba753001 Update boxes.dm 2018-11-20 21:04:49 -05:00
Kyep
d0a64445eb soup flasks 2018-11-16 09:34:57 -08:00
Kyep
070c349a81 fixes merge conflict in boxes.dm 2018-11-16 09:00:30 -08:00
Kyep
2063795224 revert/fix jacket, CC pinpointer, re-add dark lord, greytide toolbox 2018-11-16 08:47:45 -08:00
variableundefined
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
joep van der velden
202ba8b5ed Forgot ERT, moved the boxes to boxes.dm 2018-11-10 12:08:06 +01:00
joep van der velden
172102a51a Added new box sprites
Props to Shazbot for the sprites
2018-11-09 19:33:35 +01:00
Eschess
9013820a9d large boxes are actually bulky sized now 2018-11-09 15:50:58 +01:00
Kyep
07f5e956ac musician, ancient one, refactoring 2018-11-08 22:36:05 -08:00
warior4356
9be0a83269 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill 2018-11-08 01:58:53 -08:00
tigercat2000
97461b3f3d Merge pull request #10078 from variableundefined/FermentationBarrel
[READY] Port Fel's fermentation barrel from tg
2018-11-07 23:09:08 -08:00
variableundefined
85443981bb Merge pull request #10128 from datlo/syndisuitinternals
Adds internals to the syndicate spacesuit and hardsuit
2018-11-06 17:36:00 +08:00
datlo
c22304ddcb Added to hardsuit
derp'd
2018-11-05 08:15:24 +00:00
datlo
f48e016e8d Adds syndicate themed internals to the syndi spacesuit box.
Buff the syndicate spacesuit by adding a syndicate mask and a dark
extended emergency oxygen tank to the syndicate spacesuit box. This
makes it easier for perma'd traitors with an uplink/storage implant to
escape, allow to carry a full EVA package in a single convenient box,
and make it easier for a spaced traitor to fix his situation.

Uplink description updated to reflect the change.
2018-11-05 08:10:46 +00:00
AzuleUtama
a700f1f52c Traitor's Toolbelt Added
Added the belt as a variant of the military belt in the belts.dm.

Replaced the military belt in the uplink_item.dm with the new traitor's toolbelt. Price also lowered to 2TC since even with the change, it still feels pricey at that cost for what it offers.
2018-11-04 13:30:10 +00:00
variableundefined
a741ff4961 Merge pull request #9949 from AffectedArc07/ghost-spawns
Adds Space Ruins / Ghost Roles
2018-11-02 08:12:01 +08:00
variableundefined
7905b64076 Port over fermentation barrel, minor refactor of reagent container, add in wine power etc. 2018-11-01 11:01:45 +08:00
warior4356
0ee51bdcc2 Reverts maps. Fixes conflict. 2018-10-31 19:13:22 -07:00
warior4356
9adcc85b3e Added Safe-cracking Kit 2018-10-29 03:52:21 -07:00
Squirgenheimer
687d2c8f0f changed number of mining satchel slots to 10 2018-10-29 05:17:50 -04:00
variableundefined
6bece25226 Merge pull request #10008 from Normalyman/Test
Dragging won't open containers while incapacitated
2018-10-28 08:40:37 +08:00