Commit Graph

6744 Commits

Author SHA1 Message Date
oranges 59930f2a56 Merge pull request #23918 from lzimann/jetchange
Hardsuit built-in jetpacks no longer have a speed boost
2017-02-11 12:25:54 +13:00
AnturK ab797feae8 Fixes implants 2017-02-10 22:53:56 +01:00
Jack Edge 63dc0d9366 Clown internals box is now a box of hugs
🆑 coiax
add: The clown's survival/internals box is now a box of hugs. Dawww.
/🆑

Was suggested. Means the clown revolver (coming in a box of hugs) isn't
as meta'able.
2017-02-10 20:24:03 +00:00
bgobandit c75a97cd50 You can no longer take non-integer amounts of sheets from a stack. (#23908) 2017-02-10 12:16:23 -06:00
Cheridan 530d4aa887 Merge pull request #23883 from coiax/hug-box
Reverse revolver now comes in a box of hugs
2017-02-10 02:14:45 -06:00
kevinz000 70dba6e3c8 [READY]Allows people to ride around on cyborgs (#23440)
* cyborg_riding_revival

* Knockoff Damage

* ...

* Restraint checks

* Update silicon_defense.dm

* Fixes throwing humans through a wall...

* no cyborg stacks

* wew wew human harm wew wew

* Fix

* ...

* FOR_THE_LOVE_OF_GOD_WILL_YOU_JUST_FIX_PLEASE

* armchecks

* ... What?

* Fixes..

* .

* honk

* stuffs

* fixes

* fine basilcuck

* fixes

* done

* eMAAAGS

* f i x e s

* this better fucking fix reee ;-;

* fix?!

* all_ready

* hm.

* fixes

* fixes...

* woops

* fixes

* defines

* ready
2017-02-10 20:22:40 +13:00
Lzimann a4d1be75dd Built-in jetpacks no longer have a speed boost 2017-02-09 21:28:59 -02:00
James Denholm c96dc61b54 Make pens able to un-ruin casette tapes (#23852)
* Make pens wind unwound cassette tapes

* Slow the pen-winding of ruined tapes a bit.

Probably should be slower than screwdrivers (which have a toolspeed of 1). Pens are fiddly, confusing things, after all, and nobody actually knows how they work.

* Refactor tape-winding to avoid code duplication

Also fixes indents and hopefully hides a bit of idiocy on my part nobody look too close okay
2017-02-09 16:08:26 -06:00
Joan Lung e8b8e27789 Fixes being unable to place RPDs into storage items 2017-02-09 15:41:45 -05:00
oranges 8621296168 Merge pull request #23828 from Cyberboss/dropexactfix
Fixes the ex_act -> drop -> ex_act runtimes
2017-02-09 20:32:03 +13:00
Jack Edge 622eafe8ef Reverse revolver now comes in a box of hugs
🆑 coiax
add: A reverse revolver now comes in a box of hugs.
/🆑

- You can now tell if the revolver you got in your surplus crate is a
REAL revolver, or a reverse one. Also, free hugbox.

Closes #23872.
2017-02-09 04:04:29 +00: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 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
Cyberboss 67214110e4 Fixes the ex_act -> drop -> ex_act runtimes 2017-02-07 14:24:11 -05: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