Commit Graph

18687 Commits

Author SHA1 Message Date
XDTM
ac207141d2 Devilry 2016-12-22 10:33:10 +01:00
XDTM
a7c4fe55b2 for travis 2016-12-21 23:46:25 +01:00
XDTM
1789ba49e1 #cheapcode 2016-12-21 23:42:41 +01:00
XDTM
60755d647d Focuuuusss 2016-12-21 23:31:19 +01:00
XDTM
d59f78461e I'm talking to YOU 2016-12-21 23:28:44 +01:00
XDTM
9267f68b4a Couple more keywords 2016-12-21 20:07:56 +01:00
XDTM
8895ca2c62 Fix 2016-12-21 20:00:19 +01:00
XDTM
7fb7a3578b OR ELSE 2016-12-21 18:49:54 +01:00
XDTM
42c6a1602e WGW-proof 2016-12-21 18:43:01 +01:00
XDTM
fd3469d78b couple more memes 2016-12-21 18:39:08 +01:00
XDTM
1c4d8a7ba0 Multiplier 2016-12-21 18:34:24 +01:00
XDTM
809fc363bf i should read all the comments before committing 2016-12-21 17:07:58 +01:00
XDTM
75a5a3ead9 commit #1000 2016-12-21 17:06:10 +01:00
XDTM
08b570c719 step 2016-12-21 17:00:06 +01:00
XDTM
e29e6a4e7a Even more 2016-12-21 16:56:21 +01:00
XDTM
e3ce30cd4d Moooore 2016-12-21 16:09:24 +01:00
XDTM
0e3f1265cf rest and get up 2016-12-21 14:47:36 +01:00
XDTM
d4d1470d00 Thanks remie 2016-12-21 14:41:11 +01:00
XDTM
3df5db5c70 move 2016-12-21 14:30:33 +01:00
XDTM
357f24d233 more meme 2016-12-21 14:23:24 +01:00
XDTM
273df135c2 / 2016-12-21 10:38:32 +01:00
XDTM
c5b0c8b419 No force 2016-12-21 10:37:36 +01:00
XDTM
aa2a8198ec New Stuff 2016-12-21 10:29:18 +01:00
XDTM
4ab1d2db32 More commands 2016-12-21 01:08:43 +01:00
XDTM
440463f7bd vars 2016-12-21 00:19:52 +01:00
XDTM
a68a67aa74 rogue space 2016-12-21 00:06:15 +01:00
XDTM
b9037a3972 Voice of God 2016-12-21 00:05:03 +01:00
XDTM
cba9cdbda0 First batch 2016-12-18 17:31:45 +01:00
oranges
395637363d Refactor out an old cooldown system (#22179)
You can do this a lot more efficiently with world time cooldowns,
avoiding the need for spawn counters
2016-12-18 10:11:50 +01:00
oranges
e5e4b7dcc6 Merge pull request #22259 from ChangelingRain/kineticbow
Ebows can no longer have KA mods installed
2016-12-18 19:58:01 +13:00
Mervill
1b353d3cc4 Fixes russian revolver ammo displaying incorrectly (#22253)
* clean up the russian revolver code

* woops
2016-12-18 19:57:26 +13:00
MrPerson
f3b54431f3 Fixes errors with cyborg reclassification announcements (#22251)
Fixes #21997
2016-12-18 19:56:34 +13:00
Karl Parakenings
ba671b85a2 added distance check for electrocute mob proc in [power.dm] (#22231)
* added adjacency check for electrocute mob proc

* updated all calls to proc enabling range check
2016-12-18 19:55:34 +13:00
coiax
2f521b1f5f Ore satchel auto empties into ore box when dragged (#22228)
🆑 coiax
add: Whenever you automatically pick up ore with an ore satchel, if you
are dragging a wooden ore box, the satchel automatically empties into
the box.
/🆑

Because convinience. Streamlining. Less pointless clicking.
2016-12-18 19:53:27 +13:00
KorPhaeron
4b84e1d3cf Fixes syndicate base access (#22225) 2016-12-18 19:52:48 +13:00
coiax
f3c76fdc81 Transforming borgs cannot be moved (#22212)
Becaue it's weird having the old borg module fading out, and the new one
fading in on a different tile, and also smoke that's not connected to
the cyborg.
2016-12-18 19:50:49 +13:00
danno "big fucking moron" gonzales
2c8ed1130b abortions - no longer illegal! (#22205)
* abortions - no longer illegal!

* true or false: kors gay
answer: eurt
2016-12-18 19:50:08 +13:00
Mervill
309adf96c3 Pens can now be placed on top of paper bins :shock: 🚀 (#22195)
* pens can now be placed on top of paper bins :shock: 🚀

* refactor

* fix
2016-12-18 19:49:03 +13:00
coiax
f2e96fd758 Hijacking a shuttle diverts it to the syndicate base (#22184)
* Added a Syndicate dock for the Emergency Shuttle

* Removes window from doorway to syndicate base

* Diverts shuttle if the hijack conditions are met

* Fixes incorrect define

* Shuttle needs people on it to hijack

* Redoes the syndicate base extension

* Centcom always lies
2016-12-18 19:48:32 +13:00
coiax
029f82ba77 EMPs cause chameleon clothing to flicker (#22086)
* [DNM] EMPs cause chameleon clothing to flicker

🆑 coiax
add: Chameleon clothing produced by the syndicate has been found to
react negatively to EMPs, randomly switching forms for a time.
/🆑

- EMPing them when they're in the box is fine, but when they're being
worn, the game slows down a LOT, which I assume is the constant spamming
of the regenerate_icons() proc on the mob every time the chameleon
clothes change, which if they're wearing all 10 of them, that's a lot of
redundant calls.

* EMPed camoclothing no longer causes lag
2016-12-18 19:46:55 +13:00
oranges
f398088f7f Merge pull request #22208 from KorPhaeron/pai
pAI can't pull people
2016-12-18 11:11:10 +13:00
oranges
2b8af8cd53 Merge pull request #22210 from KorPhaeron/access2
pAI no longer has all access
2016-12-18 11:10:57 +13:00
Mervill
a6c1364dae paper scraps can't be worn on the head (#22249) 2016-12-17 15:15:14 -05:00
XDTM
01d1ac89b8 Golemry (#22256) 2016-12-17 14:51:19 -05:00
danno "big fucking moron" gonzales
5a0c2808af fixes #22222, and also a costume (#22235)
* fixes autodrobe not stocking past 81 items

* villain number one!!
2016-12-17 14:25:34 -05:00
Incoming5643
123426b9c9 Fixes all the occasions where a wizard could find/make sandals and get the nerfed sandals instead of the new ones introduced in #22164 (#22237) 2016-12-17 14:22:46 -05:00
Leo
ecca83ff3e Adds the Sidecut hairstyle (#22261)
* Adds the Sidecut hairstyle

* Fixes icon state
2016-12-17 14:20:53 -05:00
vcordie
e85a718311 Modify Diamond Syringe Requirements (#22260)
* Modifys the Research Requirements for Piercing Syringes

Engineering 7 Material 5 Combat 3 Makes very little sense. It's not an
engineering problem, its a materials problem. Plus, Sci shouldn't need
to track down a vortex anomaly for piercing syringes. This modifies it
to be Mat 7 (diamond sheet level), Engineering 5, Combat 3.

* Adds iron as one of steelcaps reagents

Purely to piss off kevinz

* Revert "Adds iron as one of steelcaps reagents"

This reverts commit 0a79dafc60facaeef24b57c015fdc059374df810.

* Revert "Modifys the Research Requirements for Piercing Syringes"

This reverts commit e43080359b3372048847e5d397fb3e6743fb89a1.

* Revert "Revert "Modifys the Research Requirements for Piercing Syringes""

This reverts commit 506bcf3de45c28697e8e0644941075821a96237d.
2016-12-17 14:20:07 -05:00
swindly
40b25767d2 Adds eggnog (#22238)
* adds eggnog

* adds carton
2016-12-17 14:19:23 -05:00
jughu
7e820988ab powercreep pr (#22255)
* *evil laughing*

* Update armor.dm

* Update armor.dm

* Update armor.dm

* Update armor.dm
2016-12-17 14:18:05 -05:00