Commit Graph

18687 Commits

Author SHA1 Message Date
Jack Edge 58efb041a6 Merge branch 'library-of-brass-or-blood' of github.com:coiax/-tg-station into library-of-brass-or-blood
Conflicts:
	code/modules/library/lib_machines.dm
2016-12-23 16:14:21 +00:00
Jack Edge e5f077f610 Code review 2016-12-23 16:09:24 +00:00
coiax 1c93626573 \his 2016-12-20 19:38:08 +00:00
Jack Edge e3c21f80af Library now has blood and brass (digitally)
Emagging the book management console and printing forbidden lore now has
a chance of producing a clockwork slab.

Reasoning: because sometimes it's fun to cultscare security with your
universal emag.
2016-12-20 19:18:47 +00:00
coiax 88287e90db Fixes a grammar mistake in the golem info message (#22319)
Reasoning: grammar mistakes are bad.
2016-12-20 08:43:40 -05:00
Cheridan 6535759999 Merge pull request #22304 from XDTM/Abfixors
Fixes a couple of abductor bugs
2016-12-19 20:00:02 -06:00
MrPerson 93ef32241c Fixes a bug I introduced into starlight (#22316)
Sorry, didn't test enough after some changes.
2016-12-20 11:14:59 +13:00
Leo ae7b4bcf0f Fixes paper wizard not spawning the loot (#22296)
Also removes spawn() and moves the spawn code to Destroy
2016-12-19 16:47:48 -05:00
XDTM f3ed316aa3 Replaces black magic spawn with addtimers (#22291)
* Black magic begone

* Also fix a bug
2016-12-19 12:00:08 +01:00
MrPerson fd44248cc1 Constant starlight (#22271)
Currently starlight applies multiple times for each space turf. This is stupid. Instead we'll only apply the brightest starlight to each tile. Looks much better.

Also I moved all the lighting defines into the defines folder. Also I used some of the lazyinit defines instead of manually doing it.
2016-12-19 15:35:32 +13:00
kevinz000 079b377172 [READY]PAI PATCH 2 (#22214)
* shit

* shit2

* ...

* ....

* ...

* stuffs

* fixes

* dup

* stuff

* lights and jets

* ...

* wew

* ...

* ...

* wew

* ...

* ..

* .

* Update life.dm

* Update life.dm
2016-12-19 15:33:34 +13:00
Joan Lung c3cd1f9f42 Merge pull request #22243 from KorPhaeron/borghats
Lets people put hats on cyborgs
2016-12-18 21:26:48 -05:00
XDTM 56368cacc8 Fixes things 2016-12-19 00:44:27 +01:00
spudboy555 411ad89246 Fixes clicking on clothing with pockets. (#22268)
* Fixed clicking on clothing with pockets (such as detective's fedora) not working.

* Removed flask from the detective's default backpack.

* Reworked the pockets fix to avoid breaking taking items out of pockets.
2016-12-19 12:39:25 +13:00
oranges cd215f9958 Merge pull request #22275 from AnturK/synth_fix
Fixes synth damage overlays
2016-12-19 12:39:05 +13:00
Supermichael777 64ab376212 Makes the checks used by bibles better (#22171)
* makes these checks more flexable

* oh hai mark

* praise jesus

* magicaly a better understanding of how to structure if checks lets me cut 2 lines

* wew

* spellcheck

* i shoudent code drunk

* weeeeew

* llllllaaaaaadddddd

* madcusbad

* i realy should learn desktop git

* wew

* Im just so sorry

* because we can't be having the power of atheism melting clockcult.
2016-12-19 11:34:57 +13:00
Joan Lung c24cf2b302 Revenants will be revealed by ocular wardens when targetted (#22278) 2016-12-18 11:08:21 -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
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
AnturK 73fca6a5c2 Fixes synth damage overlays 2016-12-17 15:10:05 +01:00
Joan Lung e4413b932a Ebows can no longer have KA mods installed 2016-12-16 15:57:21 -05:00
jughu 79b09b7094 makes rad crates a little more usefull (#22226)
* Update packs.dm

* cyka blyat

* >:(
2016-12-16 14:50:15 -05:00
KorPhaeron e6c8183afd Merge remote-tracking branch 'refs/remotes/tgstation/master' into borghats 2016-12-16 09:50:10 -06:00
KorPhaeron 0bda5d316e Messages were in the wrong place 2016-12-15 23:11:59 -06:00
KorPhaeron 7520d36295 ... 2016-12-15 23:07:22 -06:00
KorPhaeron bc887426ea Typecache 2016-12-15 22:58:16 -06:00
KorPhaeron 65323c60a8 Adds wizard and nursehats 2016-12-15 22:19:16 -06:00
KorPhaeron 9f82fbad42 Fixes some offsets 2016-12-15 22:13:44 -06:00
KorPhaeron df735a1266 Fixes hat paths 2016-12-15 21:56:45 -06:00