Commit Graph

5682 Commits

Author SHA1 Message Date
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 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
Cyberboss 8162ced2f9 Fixes a teleportation runtime (#23790) 2017-02-07 16:26:39 -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
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
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
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
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
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
KorPhaeron e850988a80 Removes weakeyes 2017-01-31 21:38:49 -06: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 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
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
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
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
coiax 7e4a0ee0df Adds Romerol (the REAL zombie powder) to uplink (#23369)
* Adds Romerol (the REAL zombie powder) to uplink

🆑 coiax
add: Syndicate agents have gained access to a highly dangerous
experimental bioterror agent, that causes partial reanimation and
aggression after death.
del: Zombie infections are no longer visible on MediHUD.
/🆑

- Adds a reagent to the uplink that gives anyone who injests it a
dormant zombie organ that will reanimate them as a zombie after they
die.
- Initial price estimate is 20TC because this is some fungal TB level
!fun!.
- Good for traitor chefs.
- Zombies are fun, let's have more of them.

* Fixes runtimes, removes airlock tearing

* aGGression

* Update health?

* Zombies are not TOXINLOVERS that's dumb

* Removes from uplink

* Revert "Removes from uplink"

This reverts commit a0acd313929b0787c2eab0d7f289e305212fa0ed.

* 25 TC
2017-01-29 11:21:37 -06:00
coiax 608232d288 Soapstones: Leave messages for the future crew (#23176)
* The beginnings of soapstones

* Compilation

* Sprites!

* White text

* Persistence

* More tweaks

* Why isn't it working

* Removes author name

* Random names, more checking for nulls

* VARIABLE MESSAGES

* Fixes icon conflicts

* Limited soapstone uses, purchase more at cargo

* No carving if empty
2017-01-28 17:48:55 +01:00
Haevacht a711382291 Replaces a binary OR with a proper one (#23409)
* Replaces a binary OR with a proper one

* less ()s
2017-01-28 11:53:14 -02:00
Christopher 8a31b38635 When wetting mop from janitorial cart mop will no longer try and mop the floor under the janitorial cart. (#23345) 2017-01-28 01:13:31 -06:00
Core0verload 4424fb2f2a Fixes reagent ID being displayed as blood type (#23379) 2017-01-28 01:09:42 -06:00
Cheridan c9fad927a9 Merge pull request #23245 from ChangelingRain/windowdressing
You can no longer stack multiple windows of the same direction on a tile
2017-01-27 17:27:25 -06:00
AnturK e6169e8d42 Minor AI fixes. (#23105)
* Fixes #20469

* Fixes #9062 again.

* Fixes #10283
Laws above 20 will replace laws of same or lower importance.
2017-01-26 19:40:45 -06:00
Joan Lung 214172781b Merge pull request #23333 from SweaterKittens/Man_on_Fire
Updates Names and Descriptions for Plasmamen-related Items
2017-01-26 19:56:09 -05:00
coiax 338e67808e You can now buy telecrystals in stacks of 5 and 20 (#22818)
🆑 coiax
add: Telecrystals can be purchased in stacks of five and twenty.
add: The entire stack of telecrystals are added to the uplink when
charging them.
/🆑
2017-01-26 13:37:22 +01:00
SweaterKittens 11d2b5c417 Updated names and desc for all Plasmamen related items, including the jumpsuit, helmet, formerly used suit (Now EVA suit), internals tank, and suit extinguisher refills. 2017-01-25 12:07:11 -08:00
Xhuis fcdb52c7e0 Bluespace body bags of holding 2017-01-25 08:52:16 -05:00
Jack Edge 5cf651822b Uplink implants are now empty by default
🆑 coiax
del: The Syndicate "Uplink Implant" now has no TC precharged. You can
charge it with the use of physical telecrystals. The price has been
reduced from 14TC to 4TC accordingly. (The uplink implant in the implant
bundle still has 10TC).
/🆑

- Also cleaned up implantuplink.dm.
- Removed "weak" uplink implants, which were only used for persistence
memes.

These changes will make purchasing an uplink implant more common, as you
don't have to commit a large chunk of TC to use it. It's a buff to a
rarely used syndicate item, and synergises with physical telecrystals.
2017-01-23 15:43:18 +00:00
Cyberboss 5959ac32cc Refactors atom/Initialize. Fixes ruins being initialized twice (#22778)
* Refactors atom/Initialize

Captialized for compiling correctness and to be more inline with Destroy

Will now be called from atom/New if the world initialization loop in SSobj has already run. Should always call the base.

Now comes with the `roundstart` parameter indicating whether or not it was called by SSobj or atom/New

Other fixes/tweaks:
- Renamed a proc called Initialize in abduction consoles to Setup
- Removed /obj/item/device/radio/headset/headset_sec/department: Broken and referenced literally nowhere in the code
- Removed a spawn from the Initialize of turbine_computer which made literally zero sense
- Generalized the proc which fixes RND servers with no id set

Reasoning: It's better to check roundstart per function than to have to duplicate code in New and Initialize. Think of it as a safer New for atoms. If we move enough stuff to it, initial map load performance will increase due to less New calls

* Fixed a thing

* Actually, fuck the police

* >Expecting a merge without errors

* >Not calling ..() in New

* Sanic

* Fix the headset bug

* Makes sure the map loaders dew it right

* Fixes ruins being initialized twice

* Rename roundstart -> mapload

* Revert "Rename roundstart -> mapload"

This reverts commit 667c327fd2ccfa3ce4f4db52eac03f9e8b0f6812.

* Remove unrelated change

* A more direct solution to map loads

* And now we shouldnt need this warning

* Add the new var to SSobj recovery

* Revert "Revert "Rename roundstart -> mapload""

This reverts commit dee07dbd5e4696554ac43aae5b91cce743b9b9e0.

* Line endings
2017-01-23 09:37:45 +01:00
Kyle Spier-Swenson 12570805bd Closes the Pool. (#23150)
* Delete pool.dm

* Removes usage of PoolOrNew

* Wrap up
2017-01-22 16:00:23 -05:00
Joan Lung 0633e79042 You can no longer stack multiple windows of the same dir on a tile 2017-01-22 13:43:39 -05:00
Kyle Spier-Swenson c341178ff4 Fixes bug with addtimer keeping old timers around, makes addtimer even faster. (#23126)
* Fixes timers being left around, Makes addtimer() sanic fast.

This adds a new flag, TIMER_STOPPABLE. Most(80%) of the overhead for addtimer() was in adding the timer to the associated lookup list for deltimer() to use. Moving that functionality to a flag so it wouldn't slow down the 70% of things calling timers puts the final nail in the coffin of byond's sleep/spawn().

spawn: 324 seconds across 5,948,372 calls

addtimer: 67 seconds across 5,953,220 calls

The testing setup for profiling was included in this commit, it will be removed in a later commit. @Fox-McCloud

* Remove profiling procs.

* fix runtime

luckly when this happened, we were about to resume anyways.
2017-01-20 09:31:50 +01:00
Cheridan b47ec35ee9 Merge pull request #23068 from kevinz000/patch-34
Fixes lollipops triggering weldertank explosions
2017-01-18 14:14:36 -06:00
Joan Lung 27a54d16ff Merge pull request #23051 from Core0verload/defib_fix
Fixes defibrillators
2017-01-17 18:42:57 -05:00