Commit Graph

701 Commits

Author SHA1 Message Date
variableundefined
d7b2648020 Merge pull request #10185 from Mitchs98/moveresist
Ports Move Force from TG
2018-12-28 20:53:07 +08:00
datlo
b0f60602a8 MERGE SHIT REEEEE IMMAH PUNCH A WALL 2018-12-18 11:47:29 +00:00
variableundefined
4bba6eb649 Merge pull request #10452 from Citinited/jingle-my-bells-ho-ho-ho
Adds the snow machine
2018-12-18 16:33:01 +08:00
Citinited
273d8bf02b More changes
Shovels clear away snow, it can snow on unsimulated turfs
2018-12-16 11:47:19 +00:00
Citinited
0083fba070 More changes
Snow machine is cargo-orderable during christmas, code changes, icon
tweaks, snowballs now do stamina damage instead of actual damage
2018-12-14 00:43:34 +00:00
Citinited
5529102530 Adds the snow machine 2018-12-13 08:30:39 +00:00
datlo
34db3b373e add teleporter, various misc changes 2018-12-07 16:29:48 +00:00
datlo
19e5271249 Added syndicate officer as a job proper 2018-12-07 11:07:49 +00:00
Kyep
038fb2ef67 replaces explosive mines with (new) sentry mines 2018-12-07 01:11:15 -08:00
Kyep
2593daac80 reduces pizza bomb chance from 50% to 33% 2018-12-06 19:17:58 -08:00
Kyep
0d91b3b619 deletes trapped syndi toolbox 2018-12-06 19:13:56 -08: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
AzuleUtama
9f0c127d9a Add syndi cigs to maint loot
Since an item classed as legal can only be gotten on the uplink right now.
2018-11-21 11:21:24 +00:00
Mitchell
29226ea04f Requested Fixes/Further Review 2018-11-11 19:44:35 -06:00
Mitchell
7cd25c4d87 for ansari to view 2018-11-11 15:59:48 -06:00
Spartan6
80e8b4ff19 Adds plastic bags and wet floor signs to loot maint 2018-11-07 00:52:36 +00:00
AzuleUtama
7ffa8d848c Replace military belt with traitor toolbelt in Maintenance Loot 2018-11-04 17:26:14 +00:00
joep van der velden
123611f20d fixu bugu 2018-10-27 16:59:28 +02:00
variableundefined
e2f7b7e388 Deconflict once again 2018-10-21 10:18:15 +08:00
variableundefined
45fdcb4c46 Merge pull request #9719 from SamHPurp/smoothing-improvements
Icon Smoothing to StonedMC
2018-10-21 07:41:47 +08:00
variableundefined
152a350538 Deconflict 2018-10-19 16:07:04 +08:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
Purpose
a77421f340 Oh dirt merged before the subsystem. Thats why. 2018-10-13 21:37:01 +01:00
variableundefined
569f68b128 Merge branch 'master' into RelPath 2018-10-12 14:08:19 +08:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Purpose
9ee4347965 conflicts? apparently? 2018-10-10 18:53:22 +01:00
variableundefined
309e3b04f6 Clears up some relative pathing part 1 2018-10-10 23:39:34 +08:00
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
variableundefined
042d24520e Merge pull request #9724 from SamHPurp/plasma-window-spawners
Adds plasma window spawners
2018-10-08 12:20:20 +08:00
Purpose
b28527f992 Merge branch 'master' into dirt-smoothing 2018-10-07 17:16:54 +01:00
Purpose
eeed299b86 tidyup 2018-10-07 12:43:37 +01:00
Purpose
3411d92642 adds the plasma window spawners 2018-10-07 00:15:18 +01:00
Purpose
b9d2f0a915 Revert this commit when using subsystem. 2018-10-06 21:54:38 +01:00
Purpose
a472eee850 dirt smoothing 2018-10-06 19:22:20 +01:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Purpose
d5196b66fd this should work... 2018-09-30 23:25:45 +01:00
Purpose
970d56b96c adds turf damage/scorch landmarks 2018-09-30 23:13:01 +01:00
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
Fox McCloud
b720aa4874 Merge pull request #9457 from variableundefined/30Mimes
Fixes math error with mime forcewall
2018-09-09 17:54:38 -04:00
Crazy Lemon
c37170b868 Merge pull request #9259 from Kyep/make_meth_less_op
Reduces speed bonus from Meth
2018-09-04 09:46:55 -07:00
variableundefined
1f79722446 Fixes math error with mime forcewall 2018-08-31 07:28:42 +08:00
Kyep
032557fa21 Fixes #7089 plus other bugs with spider obj attacks 2018-08-28 17:25:12 -07:00
Crazy Lemon
9806c7e156 Merge pull request #9392 from Birdtalon/posters
Small poster bugfix
2018-08-27 18:32:10 -07:00
Crazy Lemon
d59d2e76be Merge pull request #9303 from Kyep/teleport_fixes
Teleportation Fixes
2018-08-22 22:44:18 -07:00
Kyep
22c2648508 Fixes mines only checking faction on simple_animals 2018-08-22 14:47:53 -07:00
Birdtalon
08e6c5e291 fixes poster bug 2018-08-21 22:41:05 +01:00
Kyep
7f3fbcf491 fixes shields-under-falsewall bug 2018-08-18 17:24:55 -07:00
Kyep
f36468b865 comments, cleanup 2018-08-16 02:11:20 -07:00
Kyep
c1c98e46ef failure messages, depot outgoing redspace portal 2018-08-16 00:57:59 -07:00