Commit Graph

2450 Commits

Author SHA1 Message Date
coiax
311ea1c7f1 New wizard spell: The Traps (#24571)
* New wizard spell: The Traps

🆑 coiax
add: Wizards now have a new spell "The Traps" in their spellbook.
Summon an array of temporary and permament hazards for your foes, but
don't fall into your own trap(s).
/🆑

Conjures some traps in an aoe, traps include Hand of God traps and
swarmer shocking traps. Hand of God traps require 60 seconds to recharge
between trapping.

I saw Cobby give this as a TC trade, and I thought it seems reasonable
as a silly wizard spell.

* Added The Traps to spellbook, modifed trap code more

* Adds action icon for The Traps

* Need to be adjacent to disarm

* Invocation is now Latin for "BEWARE THE TRAPS"
2017-03-08 12:13:03 +13:00
Joan Lung
d5c870e714 Merge pull request #24662 from lzimann/individuallog
Adds a way to see a persons's individual logs for the round.
2017-03-05 11:57:37 -05:00
Lzimann
e58ee1724f Refactors logging into a single var for all mobs and adds a wrapper for proper logging. 2017-03-04 13:32:35 -03:00
PJB3005
64db72a150 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-04 16:31:55 +01:00
jughu
7e2fc83e1f Detective's revolver and ammo now starts in his holster (#24622)
* Update belt.dm

* Update security.dm

* Update belt.dm
2017-03-04 01:05:38 -06:00
PJB3005
a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
Cheridan
d48ce427b6 Merge pull request #24601 from coiax/fixes-puddle-desc
Fixes puddle description
2017-03-02 20:37:11 -06:00
bgobandit
85621d1e5e You can make a damp rag out of medical gauze + other sink refactors (#24500)
* adds gauze reaction, partially refactors sink water interactions

* Hey guys scarce here

Apparently it takes bandit more than 3 days to make one simple change

* Update watercloset.dm

asdf
2017-03-02 19:48:44 +13:00
Jack Edge
692b0027c6 Fixes puddle description
GOD, THIS ANNOYED ME FOR MONTHS, IT'S NOT A SINK, IT'S A PUDDLE.
2017-03-02 02:04:00 +00:00
coiax
3dee7c96b6 Drone shell changes (#24379)
* Drone shell changes

Fixes #24376.

- Drone shells are now points of interest.
- Derelict drone shells are now just dusty drone shells.

* For GUN_HOG

* Adds ushanka to derelict drones

* Less compiling errors
2017-02-27 12:28:31 +13:00
Joan Lung
cd29795b73 Clockwork objects are overall easier to deconstruct (#24424) 2017-02-26 15:31:26 -06:00
coiax
82e123a227 Adds plastic, makes plastic flaps constructable and deconstructable (#24257)
* Adds plastic, makes platic flaps constructable

🆑 coiax
add: Cargo can now order plastic sheets to make plastic flaps. No doubt
other uses for plastic will be discovered in the future.
/🆑

Later maybe we can make cable coils use plastic and metal, rather than
metal and glass. And make plastic tables. And make foam darts use
plastic rather than metal. And make spray bottles out of plastic. And
cheap plastic tables. And cheap plastic chairs.

Why? Because plastic makes sense as a material that you can make stuff
out of, and those DAMNED PLASTIC FLAPS AREN'T CONSTRUCTABLE.

* New plastic sheets sprite (STOLEN FROM BAY)

* Making plastic flaps takes time

* Constructable flaps

* Deconstruction time like walls
2017-02-25 15:54:09 +13:00
uraniummeltdown
bf0f599a05 add science crates from /vg/ (#24349) 2017-02-24 12:08:36 -06:00
Cyberboss
56a6eaa8e6 Overlay queuing (#23922)
* Overlay queuing

* Fix SS flags

* Don't copy on assignment

* Flags processing

* Fix icon_smoothing

* MSO's helper proc

* Legacy detection

* Make it work

* Fixes shitcode

* Fix the flag

* |= -> +=

* OK, how did I fuck that up?

* shitcode

* Conditional assoc queue while initializing

* Cleanup everything

* Orange meme

* This isn't perfect, but its the best byond will give us.

* forgot about dir

* oh ya

* This was litterally the last thing i did last night before heading to bed

You can tell can't you?

* Fixes various shit

* Let's not ever pause

* Fix the flag

* Cleaned up some missing shit. Added image dummys

* Remove the one usage of FPRINT

* Jesus get rid of this
2017-02-22 21:44:55 +13:00
Xhuis
dd9ef0dd0f Small Highlander patch (#24175)
* Enforces honorable combat

* Now with compiling!

* someBODY once told me the WORLD is gonna roll me

* DOES THE NEEDFUL
2017-02-22 12:00:06 +13:00
Joan Lung
37ff70d48a Taunting Tirade is more true to its intent (#24234)
* Taunting Tirade is more true to its intent

* less powerful

* eh, they have vanguard if they need that
2017-02-20 09:40:32 +13:00
Pieter-Jan Briers
a1f0f7c574 Rebasing the rebase. 2017-02-18 17:12:01 +01:00
Pieter-Jan Briers
b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00
oranges
eca3d7450a Merge pull request #24060 from Cyberboss/ProgressFix1
Fixes progress bar spam building racks
2017-02-17 14:19:01 +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
uraniummeltdown
57c89e3dae More Window Flashing (#23923)
* added window flashing pref, added windowflashing to notify_ghosts, pollCandidates and similar procs

* disabled window flash for golem shells, ash walker eggs, drone shells and posibrains

* ignorepref var for ahelp/apm and roundstart
2017-02-14 10:49:06 +11:00
Cyberboss
41a36921b6 Fixes progress bar spam building racks 2017-02-13 10:01:47 -05:00
coiax
70e66069b8 Admin tool, the life candle! (#23955)
* Admin tool, the life candle!

🆑 coiax
add: Added an admin only tool, the life candle. Touch the candle, and
when you die, you'll respawn shortly afterwards. Touch it again to stop.
Used for testing, thunderdome brawls and good old fashioned memery.
/🆑

Requested.

* Bug fixes

* Moves life_candle.dm
2017-02-13 21:12:13 +13:00
PJB3005
f11c558c99 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-12 16:35:57 +01: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
defrost256
8dd10e5102 Music Tweaks (#23896)
Musicians ability to play a song the "intended" way is impaired by the amount of alcohol consumed

🆑 Drunk Musicians
add: Drunk music
/🆑

Because it's terribly boring to listen to the same songs over and over again
2017-02-12 14:18:48 +13: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
oranges
d70fdb37b0 Merge pull request #23817 from Cyberboss/patch-1
Fix supermatter consumed in a closet by a singulo
2017-02-09 20:32:34 +13:00
PJB3005
8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01: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
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
PKPenguin321
066112c3e5 fixes sink grammar with monkey cubes (#23761) 2017-02-07 16:16:58 -06:00
Cyberboss
05ab6d8f10 Fix supermatter consumed in a closet by a singulo 2017-02-07 11:26:43 -05:00
KorPhaeron
4eaaa168a3 Replaces the limb grower with surplus limbs 2017-02-05 21:59:21 -06: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
ExcessiveUseOfCobblestone
1407003c17 Fix (#23599) 2017-02-02 13:27:37 -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
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
Firecage
5db8dad241 Fixes the TK Fireaxe Cabinet Exploit/Bug. 2017-01-30 19:26:41 +02:00
Joan Lung
7f0f9db906 Fixes something doing a locate in world 2017-01-28 20:43:28 -05:00
Cheridan
08383ad9d6 Merge pull request #23370 from ChangelingRain/structuredesc
Cult and clockwork structures have less duplicate messages in their desc
2017-01-27 18:19:21 -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
Cheridan
01552fda59 Merge pull request #23210 from KorPhaeron/music
Musical instruments will no longer generate a pop up each time a song finishes
2017-01-27 17:08:30 -06:00
Joan Lung
c15575b353 Cult and clockwork structures have less duplicate messages in their desc 2017-01-26 18:37:43 -05:00
Xhuis
fcdb52c7e0 Bluespace body bags of holding 2017-01-25 08:52:16 -05:00
Joan Lung
b4d59e90c0 Clockwork proselytizers can proselytize tables (#22991) 2017-01-25 03:33:17 +04:00
Joan Lung
e494de29bf Brass windows have less health (#23276) 2017-01-24 11:25:36 -05:00