Commit Graph

9035 Commits

Author SHA1 Message Date
PJB3005 3c8b98a3aa 9/11 2017-02-08 15:07:58 +01:00
PJB3005 8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
Cyberboss 7a94edf610 Makes firedoors adjacent to areas with fire alarms close (#23751)
* Add get_adjacent_areas proc

* Makes firealarms close border doors in adjacent areas

* Blueprint handling of firedoor lists

* More helper procs

* Make fdoors by walls not close if wall is alarmed

* MOAR HELPERS

* Handle changeturfing

* Fix the shitcode
2017-02-08 18:30:03 +13:00
oranges 99c7a8d74a Merge pull request #23766 from KorPhaeron/surplus_limbs
Replaces the limb grower with a box of surplus limbs
2017-02-08 18:28:38 +13:00
oranges f57b6c2f21 Merge pull request #23785 from coiax/guardian-of-balance
Adds 'Guardian of Balance' AI lawset
2017-02-08 18:26:30 +13:00
Xhuis 21996756be Adds the artistic toolbox and His Grace (#23699)
* Adds His Grace

* Resets victims and warnings on sleep

* Now with compiling!

* Adds the artistic toolbox and maintenance loot
2017-02-08 18:22:00 +13:00
oranges e56743458e Merge pull request #23629 from XDTM/TheLAW
Adds a Law Removal Module, other minor law changes
2017-02-08 18:21:26 +13:00
danno "big fucking moron" gonzales 3e5108f4ee new coat of paint: colored jumpsuits (#23786)
* redone colored jumpsuits

* purp scurp

* weehawwww
2017-02-07 16:32:35 -06:00
Cyberboss 8162ced2f9 Fixes a teleportation runtime (#23790) 2017-02-07 16:26:39 -06:00
PKPenguin321 066112c3e5 fixes sink grammar with monkey cubes (#23761) 2017-02-07 16:16:58 -06:00
Cyberboss 18073f8880 Fixes stacks being deleted when merged in storage (#23758) 2017-02-07 16:16:42 -06:00
Jack Edge 515f5b69c2 Adds 'Guardian of Balance' AI lawset
🆑 coiax
add: Adds a 'Guardian of Balance' lawset and AI module, currently admin
spawn only.
/🆑

- Also refactors some of AI_modules.dm to use the /datum/ai_laws stuff
to avoid law duplication.
2017-02-06 18:20:54 +00:00
Incoming5643 1ea9cb8c71 Removes "it seems pristine and undamaged." (#23708) 2017-02-06 18:32:57 +13:00
Cyberboss c8cb1626c6 Fixes some shit with implanting people (#23721)
* Makes implanters use do_mob

* Remove some unecessary checks
2017-02-06 18:27:43 +13:00
Cyberboss ff1b515b77 Fixes RPD aggression (#23724) 2017-02-06 18:25:50 +13:00
KorPhaeron 4eaaa168a3 Replaces the limb grower with surplus limbs 2017-02-05 21:59:21 -06:00
Joan Lung d1c035aa19 Merge pull request #23701 from Xhuis/ez_clean
Adds EZ-clean grenades to the uplink
2017-02-05 20:33:11 -05:00
KorPhaeron 83e3326391 I'm dead pls nerf (#23697) 2017-02-05 13:22:33 +01:00
Cyberboss b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00
jughu 4ae2eec15f Fixes #23647 (#23653)
* Ha ha HAHAHA

* Update book.dm
2017-02-05 12:27:30 +13:00
Xhuis 0d68a8f770 Adds EZ-clean grenades to the uplink 2017-02-04 15:59:36 -05:00
Joan Lung 9c579f61b3 Tweaks brass window icons (#23670)
* Tweaks brass window icons

* one tweak
2017-02-04 11:35:30 -06:00
Joan Lung 9fe0b2f2e9 Merge pull request #23502 from Cyberboss/patch-13
Prevents effects from feeding the singulo
2017-02-03 22:45:06 -05:00
Pieter-Jan Briers aeb057579e Hey it almost works 2017-02-04 01:00:12 +01:00
Cyberboss 8888f6424c Fixes geiger counters not returning a qdel hint (#23621) 2017-02-03 11:01:39 +01:00
ExcessiveUseOfCobblestone 1407003c17 Fix (#23599) 2017-02-02 13:27:37 -06:00
Joan Lung 2d2ed022cd Merge pull request #23569 from Cyberboss/HOWHARDISITTORETURNTHEBLOODYBASE
Fix some missing qdel hints
2017-02-02 10:34:07 -05:00
Cyberboss 6ec1fe2242 [s]Fixes nuke disks not relocating sometimes (#23597)
* Fixes remove from storage not forceMoving

* Fixes disks not relocating in some cases
2017-02-03 00:29:35 +13:00
oranges 52df5eadb5 Merge pull request #23586 from KorPhaeron/removesdumbvar
Removes weakeyes
2017-02-03 00:28:46 +13:00
oranges 65704446cc Merge pull request #23508 from jughu/BOOKBAG
NERFS BOOKS YES YOUR BOOKS LIBRARIAN NERF HIGH PRIORITY SPEEDMERGE
2017-02-03 00:23:57 +13:00
XDTM eb5086a307 Misc law changes 2017-02-02 12:18:49 +01:00
Cyberboss ecc3b29500 Fixes /obj/effect/landmark/start failing to GC (#23551) 2017-02-02 11:31:41 +01:00
Leo dae4a9dce3 Changes the laser projectile icon. Adds a new one when it hits a wall. (#23524)
* Changes the laser projectile icon. Adds a new one when it hits a wall.

* Changes the duration to 10
2017-02-01 15:46:43 +01:00
KorPhaeron e850988a80 Removes weakeyes 2017-01-31 21:38:49 -06:00
oranges ed41b55ed1 Merge pull request #23506 from Firecage/telefires
Fixes the TK Fireaxe Cabinet Exploit/Bug.
2017-02-01 15:56:06 +13:00
oranges 3392591f83 Merge pull request #23249 from Xhuis/bluespace_bodybag_folding
Allows bluespace body bags to be folded up with atoms inside (Winter Thaw 2017)
2017-02-01 15:49:00 +13:00
Cyberboss 9ba3f5662e Fix some missing qdel hints 2017-01-31 16:50:54 -05:00
Cyberboss 9e522fafe0 Prevents effects from feeding the singulo 2017-01-31 10:21:23 -05:00
Cyberboss d1d73bd11d Fixes the cyborg hugging module self targeting (#23465) 2017-01-31 09:38:38 +01:00
bgobandit ef2921b1c3 Adds picture frames. (#23168)
* Adds picture frames.

* Fixes bugs in photography

* clicking a photo views the photo, more consistent with other wall items
2017-01-31 09:33:07 +13:00
Cyberboss 3f7f5d4000 Removes/Refactors /mob/unEquip (#22918)
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
2017-01-31 09:28:31 +13:00
Joan Lung dede4a897d Nerfs Volt Void (#23444)
* Nerfs Volt Void

* 4

* Cyborgs no are no longer immune
2017-01-31 09:24:42 +13:00
oranges 3f7b94e923 Merge pull request #23275 from coiax/empty-uplink-implant
Uplink implants are now empty by default
2017-01-31 09:23:35 +13:00
oranges 108dd4a460 Merge pull request #23437 from ChangelingRain/alienweeds
Fixes something doing a locate in world
2017-01-31 09:21:12 +13:00
Cyberboss f7c9749ca0 Fixes some bad addtimer calls. Adds INVOKE_ASYNC. Replaces addtimer(..., 0) (#23424)
* Fixes some bad addtimers

* Adds INVOKE

* Warning for addtimer

* Working syntax

* Another bad call

* Fixes the addtimer warning

* Add suppress_zero_warning to addtimer

Useful for addtimer that uses vars

* Add INVOKE_AGAIN for when the var is already defined

* Replace addtimer(...,0) with INVOKE((...))

* Much more sensible syntax

* Less overhead, less copypaste

* Rename INVOKE_ASYNC

* Use a macro

* Allman style

* Wait, why make it a datum in the first place?

* Revert the rename

* Rename again, keep line endings

* typo

* More typos

* Untouches Addtimer

* Update callbacks.dm

* Update timer.dm

* Revert allman style

* Revert "Revert allman style"

This reverts commit 47361da15bd04eca138be5f13acdc9dd5ba89331.

* Trying to match that whitespace diff

* Why is this missing?

* I'm not fucking dealing with this!
2017-01-31 09:20:54 +13:00
jughu bbd750b315 Update book.dm 2017-01-30 21:06:20 +01:00
Firecage 5db8dad241 Fixes the TK Fireaxe Cabinet Exploit/Bug. 2017-01-30 19:26:41 +02:00
AnturK 6470464ec1 Map Decals v.2 (#23385)
Simple decal system to replace turf stacking and icon state duplication.
Plus simple script to help with path updates that are bit more complicated that search&replace.
Fixes caution tiles turning into space.
Fixes flipped corner decals.
Fixes gas list property whitespace on replacing.
2017-01-30 10:20:39 +13:00
XDTM fcf4320bb5 [Ready for review/merge]Rolls chainsaw surgery into prosthetic replacement, makes synthetic armblades implantable (#23213)
🆑 XDTM
tweak: Implanting chainsaws is now a prosthetic replacement instead of its own surgery.
add: You can now implant synthetic armblades (from an emagged limb grower) into people's arms to use it at its full potential.
del: Chainsaw removal surgery has been removed as well; you'll have to sever the limb and get a new one.
/🆑
Reason for adding

Makes the surgery code more consistent, without a snowflake surgery for chainsaws. This also gives a legitimate use for synthetic armblades, which were otherwise just a much shittier and harder to get circular saw.
2017-01-30 09:51:55 +13:00
Supermichael777 17f6284d8d Ports Tiki mask from Hippie and adds the alt version of the wooden chair to the crafting menu. (#23161)
tweak: The wooden chair with wings is now craft-able. -1 non reconstruct-able map object

add: Added the Tiki mask, you can make it in wood's crafting menu.

imageadd: Ported Tiki mask's sprites from Hippie station. It is under the same Creative Commons 3.0 BY-SA as the rest of our sprites. They are from Nienhaus.

For the mask the reason is UNGA-BUNGA. For the chairs I just hate map objects that players can't fix.
2017-01-30 09:47:06 +13:00