Commit Graph

5713 Commits

Author SHA1 Message Date
oranges
89a3a9bf79 Merge pull request #24051 from Cyberboss/patch-13
Prevents energy weapons from being sharpened
2017-02-15 01:40:24 +13:00
oranges
b45d26b0f8 Merge pull request #24022 from MrPerson/FILES_go_in_SINGLE_QUOTES_you_fuckwits
Puts files in single quotes like they belong
2017-02-15 00:57:28 +13:00
Cyberboss
d27899ce64 Unequip refactor fix pack (#24040)
* Fixes drag drop deletion

* Fix it for clothing as well

* Do it properly

* Various other incap checks I noticed from the unequip refactor

* Time to generalize this shitty shit

* PADDLING!!!

* A whole bunch of ree
2017-02-14 08:52:56 +01:00
Jordie
ff77631a8d Merge pull request #24024 from RandomMarine/pillsplitter
Splits charcoal pills apart
2017-02-14 10:57:44 +11:00
Jordie
02fca3d9a9 Merge pull request #24032 from ChangelingRain/rpdfix
Perpetual RPD fix
2017-02-14 10:10:58 +11:00
oranges
9add09a667 Merge pull request #23957 from swindly/soda_premium
Adds Nuka Cola as a premium item for Robust Softdrinks
2017-02-13 21:07:29 +13:00
Cyberboss
6f306f4250 Prevents energy weapons from being sharpened 2017-02-13 01:35:53 -05:00
Joan Lung
eb9a1009d3 Perpetual 2017-02-12 15:55:35 -05:00
anconfuzedrock
f8d9e14832 Adds crafting blindfolds, hacked autodrobes contain a blindfold and muzzles (#23953)
* I didn't want to make muzzles come from the autodrobe but I couldn't think of where else it could go

* Update vending.dm

* Update vending.dm

* Update sheet_types.dm
2017-02-12 17:55:05 +01:00
RandomMarine
6cfa865b4c splits apart charcoal pills 2017-02-12 08:40:22 -08:00
MrPerson
9dd81f1da8 Puts files in single quotes like they belong
This means they're included into the rsc and sent out althogh almost all of these files were already included elsewhere. Also DM will yell if the file couldn't be found for whatever reason like if someone moves or renames it.

I left out some file types for various reasons
dmis used in overlays: I have another pr I'll do later which will fix all of them and I don't want to conflict with myself
text files: they would get included in the rsc, which is completely unnecessary. However they're small, so they might be worth including anyway
2017-02-12 07:15:18 -08:00
Joan Lung
6bf5deb0d2 Merge pull request #23966 from lzimann/ihatethis
Possessed blades now have a "Never for this round" button
2017-02-12 09:05:00 -05:00
Cheridan
74588b703b Merge pull request #23946 from coiax/hug-box-2
Clown internals box is now a box of hugs
2017-02-12 02:43:56 -06:00
coiax
e4e192c3a3 BYOS shuttle restrictions (Shuttle changes #1) (#23904)
* BYOS shuttle restrictions (Shuttle changes #1)

🆑 coiax
add: The Build your own shuttle kit can only be bought in the first five
minutes of the shift.
/🆑

- BYOS restriction is to avoid grief.

* Moves the defines

* Ten minutes
2017-02-12 14:13:44 +13:00
oranges
e45a0c16e6 Merge pull request #23948 from AnturK/implanterinio
Fixes silicon implants
2017-02-12 14:12:27 +13:00
Shadowlight213
c8c152bd37 Removes unused translate_hive var (#23924) 2017-02-11 18:37:44 -06:00
Joan Lung
ca4b081e26 Fixes RPDs (#23985) 2017-02-11 17:51:34 -06:00
oranges
cb9519f32f Merge pull request #23913 from ChangelingRain/rpdfix
Fixes being unable to place RPDs into storage items
2017-02-12 09:31:45 +13:00
Dannno
597242748a whhops 2017-02-11 14:34:14 -05:00
Cheridan
c5d629685b Merge pull request #23938 from dannno/thank_you_dr_chine
new style toolboxes lol
2017-02-11 12:45:19 -06:00
Dannno
bb5107f4b8 lmao i threw up on your ugly toolboxes you fat fags 2017-02-11 12:32:59 -05:00
Lzimann
23c68e3f16 Possessed blades now have an ignore category 2017-02-11 11:50:14 -02:00
swindly
6fc0d8c0b6 adds nuka cola to soft drinks 2017-02-10 21:47:59 -05:00
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
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
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