Kyep
bf9d0b088f
merge conflict fix, reset map
2019-01-07 16:37:07 -08:00
variableundefined
18881b2592
Merge pull request #10595 from AzuleUtama/caneDartChange
...
Mime's Cane Shotgun ammo reworked and buffed
2019-01-06 16:19:15 +08:00
variableundefined
b3d27c7202
Merge pull request #10584 from datlo/removeuplinkmanagement
...
Replaces uplink management by automated sharing + various misc outfit changes
2019-01-06 16:14:59 +08:00
variableundefined
25f4665da7
Merge pull request #10580 from datlo/capufakedeath
...
Capulettium/Capu+ fakes death convincingly
2019-01-06 16:12:56 +08:00
alex-gh
466d8c7a22
Fixes active deswords being pocketable.
2019-01-05 13:05:44 +01:00
AzuleUtama
fb052938c8
Cane shotgun darts more effective + other changes
2019-01-05 01:41:39 +00:00
variableundefined
7e5930a2a0
Merge pull request #10527 from Mithrandalf/toycuffs
...
A new toy for the clown
2019-01-04 20:03:39 +08:00
Kyep
d488195799
fix merge conflict, wipe map changes
2019-01-03 14:39:41 -08:00
datlo
42efc6aeae
moved pill bottle to first aids
2019-01-03 17:13:07 +00:00
datlo
61c0f71cce
Replaces uplink management by automated sharing
...
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
2019-01-03 16:29:31 +00:00
datlo
244fcfc739
capu/capu+ fake death for realsies, add fake death pills to syndis/maint
2019-01-02 09:46:03 +00:00
Mithrandalf
6e21f6a781
tiny little code tidy
2018-12-29 22:51:58 +00:00
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
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
Mithrandalf
1fa290ece4
all the new stuff
2018-12-28 15:42:07 +00: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
variableundefined
d1a31f22ca
Merge pull request #10509 from improvedname/Request
...
Adds a syndicate emergency box
2018-12-28 20:46:16 +08: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
ac2d3396d6
Removes redundancies, makes exception for clumsiness
2018-12-27 20:20:19 +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
Shadow-Quill
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
variableundefined
65ca04f05d
Merge pull request #10450 from datlo/toxinstechdisk
...
Add toxins technology research and the Bluespace RPD
2018-12-24 09:20:52 +08:00
variableundefined
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
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
variableundefined
c011c0ad2f
Merge pull request #10441 from datlo/boxsprites
...
Add sprites to specie specific boxes
2018-12-15 18:15:52 +08:00
variableundefined
0c134f19b8
Merge pull request #10389 from Edefff/Fix-cigarette-chem-consumption
...
Fix cigarette chem consumption
2018-12-13 23:08:54 +08:00
variableundefined
16a064d1e6
Merge pull request #10422 from Kyep/depot_update_4
...
Depot Update
2018-12-13 23:06:29 +08:00
variableundefined
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
variableundefined
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