Commit Graph

40825 Commits

Author SHA1 Message Date
Joan Lung e83c720e8c say_log now has timestamps 2016-12-20 11:01:30 -05:00
tgstation-server ef8168651a Automatic changelog generation for PR #22272 [ci skip] 2016-12-18 15:32:09 +00:00
Mervill 74923c69fa added a credit deposit to pubbystation's vault (#22272) 2016-12-18 10:32:07 -05:00
Haevacht a6711a7003 Tomb of the Dragoon, and the Sky Bulge lance (#22270)
* Sky Bulge Commit mk2

WORK THIS TIME.

* Indentation.

* Jordbord's suggestions

Incorporated. The bone spear line was also doubletabbed I was set up!

* FUCKING INDENTATION

* the flan update

they don't exist in world but here have a mob

* we fireflans now

also isliving is in now, just gotta actually map a thing

* the tomb update

it's bigger now

* .gitignore revert

* workpls

* Revert ".gitignore revert"

This reverts commit 1fefd34fc7c0dbc8f1f353a95e53665e03ba75cf.

* workthistime

* Revert "workthistime"

This reverts commit 214509d5abda941c470708431536ccd715334e8e.

* well it's the closest gitignore fix so far

* fix dme change

will need to be loaded for the map part to work though

* gitignorerevert take 43

* jordbord fix mk 2

* includes flan.dm in the .dme
2016-12-19 00:12:12 +11:00
Jordie 04442cd533 Merge pull request #22192 from optimumtact/spacevine
Spacevine refactor and qdel improvements
2016-12-18 22:42:22 +11: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
tgstation-server c7257fe38e Automatic changelog generation for PR #22253 [ci skip] 2016-12-18 06:57:28 +00: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
Mark9013100 a838c408ac Edits a few boots/shoes (#22244) 2016-12-18 19:56:16 +13:00
tgstation-server f7c92172ba Automatic changelog generation for PR #22231 [ci skip] 2016-12-18 06:55:35 +00: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
tgstation-server 226c5d36fc Automatic changelog generation for PR #22228 [ci skip] 2016-12-18 06:53:28 +00: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
tgstation-server 87bbb340e4 Automatic changelog generation for PR #22205 [ci skip] 2016-12-18 06:50:14 +00: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
tgstation-server d7b73b5aaf Automatic changelog generation for PR #22203 [ci skip] 2016-12-18 06:49:47 +00:00
XDTM cddce20ba9 Adds combat tentacles for changelings (#22203)
* Combat tentacles

* wrong layer

* No spawn

* null and void

* /proc/
2016-12-18 19:49:45 +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
tgstation-server 2d5e127eae Automatic changelog generation for PR #22086 [ci skip] 2016-12-18 06:46:56 +00: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
Joan Lung 64bc659fdd You need to be able to speak to use Hierophant Network/Broadcast (#22242)
* You need to be able to speak to use Hierophant Network or a Clockwork Obelisk

* hm!

* these too
2016-12-17 18:28:51 -05:00
MrPerson 94eac6ca0e Fix electric chairs not working sometimes (#22250)
Fixes #22155
2016-12-17 18:25:37 -05: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
Okand37 cf8610d73e DeltaStation 2.0 (#22066)
* Deltastation Playtest map

* Fixed Final Draft Deltastation Testmerge Playtest

* Fixed Final Draft Deltastation Testmerge Playtest and removes empty file

* Final Draft Deltastation bugs, issues, oversights fix 2.0

* More fixes!

* May the fixes guide you on your journey, brave undead

* minor fixes for the night

* more bugfixes 3.0!!

* A big ol' batch of potpourri

* added camera network for bridge/telecomms/engi/atmos

* minor fixes

* xenobiology cameras

* Xenobiology and chemistry grenade casings

* DeltaStation 2.0
2016-12-17 15:18:27 -05:00
Mervill a6c1364dae paper scraps can't be worn on the head (#22249) 2016-12-17 15:15:14 -05:00
tgstation-server 62058ecdb3 Automatic changelog generation for PR #22256 [ci skip] 2016-12-17 19:51:21 +00:00
XDTM 01d1ac89b8 Golemry (#22256) 2016-12-17 14:51:19 -05:00
tgstation-server bcd2c0bd1c Automatic changelog generation for PR #22235 [ci skip] 2016-12-17 19:25:35 +00: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
tgstation-server 5362b0bf31 Automatic changelog generation for PR #22261 [ci skip] 2016-12-17 19:20:54 +00: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
tgstation-server 3cd495ac12 Automatic changelog generation for PR #22238 [ci skip] 2016-12-17 19:19:24 +00: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
PKPenguin321 987a10faca fixes EMPs affecting cult shields (#22207)
makes emp_act return for the cultist shield subtypes
2016-12-16 23:20:43 +01:00
tgstation-server 58570f628a Automatic changelog generation for PR #22141 [ci skip] 2016-12-16 21:29:02 +00:00
Firecage 3648991237 Adds Titanium Airlocks (#22141)
* Adds Titanium Airlocks

* Adds Glass titanium airlock, and non-functional assembly for it.
2016-12-17 10:29:02 +13:00
Joan Lung e4413b932a Ebows can no longer have KA mods installed 2016-12-16 15:57:21 -05:00
Joan Lung 9e4ed28cb7 Halves clockwork power drain speed (#22218) 2016-12-16 14:50:58 -05:00
tgstation-server e3a6ce8637 Automatic changelog generation for PR #22226 [ci skip] 2016-12-16 19:50:16 +00:00
jughu 79b09b7094 makes rad crates a little more usefull (#22226)
* Update packs.dm

* cyka blyat

* >:(
2016-12-16 14:50:15 -05:00
Cheridan e608ff0f7c Merge pull request #22221 from Incoming5643/patch-30
Sets abduction mode's suggested maximum players to 50
2016-12-16 05:46:50 -06:00