Commit Graph

34181 Commits

Author SHA1 Message Date
Lombardo Paredes a01eda01e1 Add handicons for the winter coats (#25261)
* Add handicons for the winter coats

Redid the PR because merge conflicts.

* Add item_states
2017-03-18 21:30:03 -04:00
Lexorion 76dbaea8dc Gives the swat mask unique inhands (#25255) 2017-03-18 19:32:26 -04:00
Lombardo Paredes 63293d60f5 Add inhand icons for security winter coat (#25245)
Add inhand icons for security winter coat
2017-03-18 15:49:28 -04:00
Leo eaab4f5012 Merge pull request #25206 from octareenroon91/patch-39
Fix ecig chem consumption
2017-03-18 15:26:02 -03:00
WJohn 821202b936 Merge pull request #25195 from uraniummeltdown/plantdisk
New Plant Data Disk Sprite
2017-03-18 14:11:57 -04:00
AnturK d61dc54d17 Abductor fixups (#25210) 2017-03-18 14:44:10 -03:00
Leo cae016603a Merge pull request #25198 from Cyberboss/patch-18
Removes an annoying testing message
2017-03-18 14:27:41 -03:00
Leo 4f95a168ce Merge pull request #25201 from ChangelingRain/sayhowmuch
Proselytizers now say how much brass sheets cost to make on examine
2017-03-18 14:24:09 -03:00
coiax 6c6254fc5c Fixes deadchat not being notified of random events (#25203)
My bad.
2017-03-18 18:18:08 +01:00
Cyberboss 3889d0372d Fix event cancellation (#25200)
* Fix event cancellation

* CANT
2017-03-18 18:15:10 +01:00
KorPhaeron 20b65bb29f Fixes aliens hitting themselves with their own projectiles (#25197) 2017-03-18 18:14:03 +01:00
Lexorion f35b8cd8a9 Gives the sechailer unique inhands (#25232) 2017-03-18 11:28:50 -04:00
Jordie b3dd0479ce Merge pull request #25191 from lzimann/shadowpeople
Fixes wrong organ slot for eyes on species gain
2017-03-19 01:55:10 +11:00
Jordie d15859dc17 Merge pull request #25188 from lzimann/ivdrips
Fixes a potential runtime with iv drips, also adds mouse_drag_pointer for it
2017-03-19 01:54:52 +11:00
MrPerson 2394b4ce7c More lighting fixes for white space and black tiles (#25229)
* More lighting fixes for white space and black tiles
2017-03-18 09:42:50 -03:00
XDTM 6f184513a0 Runic golems (#25028) 2017-03-18 08:04:47 -03:00
Cyberboss 6e744de10c Adds a way for admins to keep the arrivals shuttle docked permanently (#25136) 2017-03-18 08:02:09 -03:00
Leo 6845cab264 Merge pull request #25189 from Supermichael777/golem2
Adds an id card to the free golem ship vendor
2017-03-17 23:25:10 -03:00
Leo d13c00f17b Merge pull request #25148 from Cyberboss/patch-35
Makes SSlighting fully initialize
2017-03-17 22:02:40 -03:00
Leo 092cf72835 Merge pull request #25186 from coiax/fixes-post-nuke-all-clear
The alert level is no longer lowered by a nuke's detonation
2017-03-17 21:49:52 -03:00
Cheridan 9659981dba Merge pull request #25183 from ExcessiveUseOfCobblestone/somethingwithgulagbutiforgot
Does some more theorycrafting with gulag minerals
2017-03-17 18:20:11 -05:00
Cheridan 44b6e31725 Merge pull request #25181 from lzimann/orm
Refactors ORM code
2017-03-17 17:28:42 -05:00
Cheridan 46da9d2b81 Merge pull request #25011 from PKPenguin321/flashdark
Adds flashdarks
2017-03-17 17:09:27 -05:00
Cheridan 544b41e1e5 Merge pull request #25180 from ExcessiveUseOfCobblestone/penoriented
THIS STUPID PEN PR FINALLY IS FINISHED GAH
2017-03-17 17:04:53 -05:00
Leo cceb50a932 Fixes a runtime when a ling tries to absorb a person that never spoke anything (#25185) 2017-03-17 16:24:51 -04:00
Cheridan 9e0cb1ad1f Merge pull request #25176 from PJB3005/tabs
Tabs for indentation, spaces for alignment.
2017-03-17 15:23:12 -05:00
Cheridan 6a515563f6 Merge pull request #25143 from Cyberboss/ControllerRestart
Fixes some badness with controller restarting
2017-03-17 15:12:34 -05:00
Cheridan ecbda60833 Merge pull request #25150 from Iamgoofball/planet_station
Planetstation: Build over chasms
2017-03-17 15:04:38 -05:00
Cheridan 7430c2ff1a Merge pull request #25156 from MrStonedOne/patch-333
Make get_turf_pixel always take icon size into account
2017-03-17 14:44:50 -05:00
Cheridan 3d36848cd3 Merge pull request #25170 from AnturK/adjacenttohell
Fixes adjacency
2017-03-17 14:33:41 -05:00
Remie Richards 0b6d5fc6df Dynamic hair! (#25114)
* Dynamic hair!
2017-03-17 16:05:02 -03:00
Lzimann cb4b9a91c6 Requests console now have a receive ore updates variable.
Also updates all maps with it.
2017-03-17 15:04:00 -03:00
octareenroon91 6384b1a240 Update cigs_lighters.dm
Cause cigs/ecigs to consume chemicals whether or not the owner can absorb them.
2017-03-17 12:08:48 -05:00
Cyberboss 3c9b0b152b Refactors statclick a bit (#25102) 2017-03-17 13:29:25 -03:00
Joan Lung b8828c3991 Proselytizers now say how much brass sheets cost to make on examine 2017-03-17 11:55:14 -04:00
Cyberboss 0bb7407503 Adds a configuration option for disabling preferred maps (#25137)
* Adds a config option to disable map voting
2017-03-17 12:50:26 -03:00
Cyberboss b15f98766d Removes an annoying testing message 2017-03-17 11:42:51 -04:00
Leo 5aeb4d7a87 Merge pull request #25168 from ChangelingRain/wizarddenfix
The Wizard's Den now has dynamic lighting
2017-03-17 12:37:13 -03:00
Joan Lung 58216c4189 Merge pull request #25192 from MrPerson/no_more_reverts_this_pull_request_has_a_family
Fixes non-dynamically lit areas being pitch black
2017-03-17 11:07:15 -04:00
Xhuis 764ec63713 Adds the power flow control console (#25001)
* Adds the power flow control console

* Minor cleanup

* Adds some new stuff

* Tweaks sounds

* Added access requirements, admin logging, AI restriction

* Part 1: Remove dem consoles

* Put dem consoles back

* Small patch

* Some work I can't remember

* Sanity checkin'

* Maybe now!

* Sanity checks pass 3295912

* Sanity checks
2017-03-17 15:57:56 +01:00
Cyberboss ca070c5efa Fixes being able to move certain spawnpoints (#25135) 2017-03-17 15:03:15 +01:00
uraniummeltdown 2ba2dd5d1d plant data disks use new sprite from baystation 2017-03-17 16:22:24 +04:00
MrPerson 0722cc96ff Fixes space being white with parallax off 2017-03-16 23:35:34 -07:00
MrPerson b71e89ce10 Fixes non-dynamically lit areas being pitch black
Fixes #25179 (Legitimate closing of a pull request, thanks for this bug github)
Fixes #25164
2017-03-16 21:30:06 -07:00
Lzimann df6647db1a Fixes wrong organ slot for eyes on species gain 2017-03-17 01:20:15 -03:00
Leo 7b2b19f1f8 Merge pull request #25152 from optimumtact/youhavedonetheworldalittlebitmoresad
Modifies admin message on href spam
2017-03-17 00:28:58 -03:00
Iamgoofball 099c822b7c RCD refactor (#25154)
* Refactors RCD code
2017-03-17 00:22:22 -03:00
Cyberboss c09d61ae79 Runtime station fixes (#25151)
* Fixes spawning on runtimestation titlescreen

* Fix shuttle runtimes
2017-03-17 00:07:34 -03:00
oranges 8848d46b0c Merge pull request #25141 from MrStonedOne/patch-332
Remove low priority from lighting
2017-03-17 15:42:20 +13:00
Supermichael777 b533abe073 Adds an id card to the free golem ship 2017-03-16 21:43:45 -04:00