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
variableundefined
f604b6f643
Merge pull request #10489 from AffectedArc07/emitter-reflectors
...
Adds Emitter Reflectors
2019-01-04 20:02:07 +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
variableundefined
e4d0914103
Merge pull request #10554 from farie82/refactor-to-make-parser-work
...
Changes the laser tag objects to be less dumb and fix a / after encryptionkey
2018-12-31 08:38:53 +08:00
variableundefined
3f1f8f954f
Merge pull request #10555 from alex-gh/autosay_fix
...
Fixes death alarms/beepsky/etc. radios.
2018-12-31 08:38:02 +08:00
alex-gh
d722c32f12
Fixes death alarms/beepsky/etc. radios.
2018-12-30 15:35:20 +01:00
joep van der velden
1b5322c32e
Refactor a few small things to make my research level parser work and make the code less odd
2018-12-30 15:18:00 +01: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
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
variableundefined
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
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
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
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
AffectedArc07
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