Commit Graph

7716 Commits

Author SHA1 Message Date
Kyep
e69c74259a adds BoH/nvmeson/matscanner/thermals, moves speed potion 2019-01-10 16:01:46 -08:00
Kyep
dd2808313e adds bluespace rpd, removes strange object 2019-01-10 15:36:12 -08:00
Kyep
51279caafd adds healgland, cycler shotgun, enforcers, oxytank 2019-01-10 15:19:41 -08:00
Kyep
787aee9655 replace trade objectives with 15 plasma bars & 10,000c 2019-01-10 15:16:59 -08:00
datlo
be34d8b6bb MAGIC MIRROR PART 3 ELECTRIC BOOGALOO 2019-01-09 10:48:34 +00:00
Kyep
8a4461c89e tweaks comment 2019-01-09 00:04:47 -08:00
Kyep
ee5c6421a6 spacing 2019-01-07 22:52:52 -08:00
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
variableundefined
f344450885 Merge pull request #10573 from lass9030/head_huds
Single HUD implant to heads locker
2019-01-06 16:10:48 +08:00
variableundefined
48a87424a0 Merge pull request #10553 from Citinited/we're-walking-in-the-air
Do you wanna build a snowmaaaaaaaan~
2019-01-06 15:56:55 +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
ebe239c09b Merge pull request #10501 from datlo/wizforcewall
Refactor and buff wizard force wall, add greater force wall
2019-01-04 20:02:54 +08:00
variableundefined
f604b6f643 Merge pull request #10489 from AffectedArc07/emitter-reflectors
Adds Emitter Reflectors
2019-01-04 20:02:07 +08:00
Kyep
29e62bf0bc blue snowmobile 2019-01-03 20:49:33 -08:00
Kyep
0567eab562 Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update 2019-01-03 14:40: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
lass9030
b79e02dd41 Lets not forget mining, eh? 2019-01-01 17:01:50 +01:00
lass9030
b96ce8db76 hudimplant to heads locker 2019-01-01 16:53:52 +01: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
Citinited
eff4107049 Snowman drops stuff on destroy now 2018-12-30 03:00:33 +00:00
Citinited
48f37473d7 proper path for built snowmen 2018-12-30 02:25:34 +00:00
Citinited
ccb61518ae You can now build snowmen at Christmastime; removes commented out code 2018-12-30 02:15:05 +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
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
AffectedArc07
53f6ed548d biggest change ever 2018-12-29 10:55:59 +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
d7b2648020 Merge pull request #10185 from Mitchs98/moveresist
Ports Move Force from TG
2018-12-28 20:53:07 +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
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