Commit Graph

511 Commits

Author SHA1 Message Date
duncathan salt 9d30d88b65 Merge pull request #25706 from kevinz000/patch-105
Fixes exile implant bypassing
2017-04-02 02:03:05 -06:00
kevinz000 539b4783f6 Update gateway.dm 2017-03-30 17:25:47 -07:00
oranges d7ac92a292 Revert "SWAT vest !!!DOES NOT BUFF SWAT!!! (#25236)" (#25620)
This reverts commit 86cbbaf572.
2017-03-29 18:05:10 -04:00
bawhoppen 86cbbaf572 SWAT vest !!!DOES NOT BUFF SWAT!!! (#25236)
* our father

* forgot to mapmerge

* it's happening
2017-03-30 00:59:27 +03:00
Jack Edge 053e71d518 Moves vars of cabin map generator to type definition 2017-03-29 17:37:38 +01:00
coiax 4c66182ff0 CTF teams have their own radio channels + fixes (#25456) 2017-03-25 19:53:03 -03:00
Cyberboss 874d85d70c You wouldn't believe it another missing qdel hint! (#25113) 2017-03-14 20:42:47 -04:00
coiax f1d1e6f5e9 Demotes HANDSLOW to secondary flag (#24878)
It's used in literally four places, it doesn't need a high speed
bitflag slot.
2017-03-13 21:59:48 +13:00
Lzimann 5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Xhuis 86488d18d3 Fixes some issues and closes others; nerfs abductor emergency teleporter (#24690)
* Fixes Wish Granter resurrection spam

* Fixes box icons

* Emergency teleporter nerf
2017-03-06 12:20:55 +01:00
PJB3005 64db72a150 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-04 16:31:55 +01:00
coiax 7b3fe757d7 Some CTF changes (#24595)
* Some CTF changes

🆑 coiax
add: CTF players start with their helmet toggled off, better to see the
whites of their opponents eyes. Very briefly.
fix: Existing CTF barricades are repaired between rounds, and deploy
instantly when replaced.
tweak: Healing non-critical CTF damage is faster. Remember though, if
you drop into crit, YOU DIE.
add: Admin ghosts can just click directly on the CTF controller to
enable them, in addition to using the Secrets panel.
/🆑

- @Cyberboss also look at all my New->Initialize conversions.

* Procifies toggle_ctf

* Whoops, two procs with the same name
2017-03-04 23:37:00 +13:00
PJB3005 a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
Tofa01 1c4e0f832a Fixes ID Access For Player Sleepers & Fixes Space Bar Access To Kitchen Freezer (#24430)
* Fixes space bartender not able to access kitchen freezer

* Fixes id_access on awaymission sleepers
2017-02-26 15:31:55 -06:00
Cyberboss 5b14349ec3 Fixes null.handle_fall()... again... (#24303) 2017-02-21 09:14:16 +01:00
Cyberboss 71ac987a9d Fixes away missions not loading (#24296)
* Delete the old map_template.dm

* Fixes #24291
2017-02-21 09:07:50 +01:00
Pieter-Jan Briers 1956ace5c7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-19 15:10:23 +01:00
Cyberboss 1365ab99d8 Merges map templates and map loader (#24140)
* Reorganize the mapping code

* Finish this up

* Reee line endings

* FUCKING LINE ENDINGS

* LINARU ENDARU

* >PLS SET REPO LINE ENDINGS

* Comments

* Hoisted by my own travis.yml changes
2017-02-19 16:55:02 +13:00
Pieter-Jan Briers b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00
oranges acbe49d279 Merge pull request #24139 from Cyberboss/Separation_of_church_and_state
Moves atom functionality from SSobj to SSatoms
2017-02-19 00:48:04 +13:00
Cyberboss 3c9d1ff235 Fixes spawners running in nullspace (#24109) 2017-02-15 22:48:40 -06:00
coiax 1afcc031e9 Main CTF gun disappears when dropped on the floor (#24087)
🆑 coiax
fix: The main CTF laser gun disappears when dropped on the floor.
/🆑

Brings it in line with all the other ammo and guns, I wanted the only
source of ammo to be the deathdrop ammo pickups. Also, it prevents the
red team from shooting blue team's guns.
2017-02-15 22:46:48 -06:00
Cyberboss 9050485817 Moves atom functionality from SSobj to SSatoms 2017-02-15 12:35:55 -05:00
Leo 9c6803ae19 Ports Paradise error handler, with in game runtime viewer! (#24036)
* Ports paradise error handler, with in game runtime viewer!

* Changes to the old runtime error and removes inerror reference

* Oops

* Adds a wrapper for world.log so it displays both in the runtime diary and in DD window
2017-02-14 11:39:31 +11:00
PJB3005 8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
kevinz000 0ced9342b9 [READY]Aimable wizard lightning bolts (#23723)
* ZAP!

* YOU DID NOT SEE THAT

* YOU DI NOT SEE THAT 2

* object orientated pr

* gdi

* protection

* object orientated pr v2

* REEEE

* blacklists

* Update magicarp.dm
2017-02-08 18:31:52 +13:00
Kyle Spier-Swenson 362afcd70d fixes ctf being a butt (#23709) 2017-02-05 21:36:44 -06: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
Cyberboss 44b0aa2aa7 You have to call the base, dammit! (#23544) 2017-02-01 20:11:49 +01:00
Cyberboss a4d5579f79 Initialize Safety Cleanup (#23274)
* Better `in world` Initialization handling

Remove spawn_atom_to_world and SSobj.atom_spawners

Roll SSobj/setup_template_objects and SSobj/Initialize into new generic proc

* >BYOND

* >var names

* Defines

* Actually remove the spawn_atom_to_world definition

* A note on NOT CALLING THE BASE

* Remove set waitfor = 0

* My comments are cool

* In order to prevent just that...
2017-02-01 15:48:17 +13:00
oranges b8102e276d Fix the incorrect proc call for gateway 2017-01-31 09:05:06 +00:00
kevinz000 ea6299db95 [READY]Gateway Update (#23066)
Saves on some lines of code
Makes some gateway things vareditable
Makes an admin verb accessible again
Makes away mission starts spawnable.
2017-01-31 21:59:34 +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
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
coiax c6bc3436b3 Stops people dragging CTF spawn traps (#23229)
🆑 coiax
fix: Fixed dragging the spawn protection traps on CTF.
/🆑
2017-01-22 15:47:51 -05:00
Leo 0e08ab75e3 Let's trust byond! 2017-01-19 19:14:50 -02:00
Lzimann 6425579b93 Fixes id_access_list not working on mob spawners. 2017-01-18 08:55:38 -02:00
PJB3005 7356e80484 hey that should be everything except making it compile. 2017-01-17 22:08:27 +01:00
Mervill cd0912f77f seedRuins exits with a warning if provided a z level that does not exist (#22860)
* seedRuins exits with a warning if provided a z level that does not exist

* if no z levels are provided, don't generate any ruins
2017-01-15 21:17:53 +13:00
oranges 541c8ad135 Merge pull request #22845 from Core0verload/equipment_fix
Refactor of outfits datums and corpse spawners
2017-01-10 10:10:10 +13:00
oranges 21331f6c14 Merge pull request #22741 from KorPhaeron/anchoredflagholder
CTF bug fixes
2017-01-10 09:52:17 +13:00
c0 0b311121d9 Refactor of outfits datums and corpse spawners 2017-01-08 10:30:31 +03:00
KorPhaeron e126136bf8 Why did they need nodrop in the first place 2017-01-04 17:53:02 -05:00
KorPhaeron b0585031f7 Fixes body dusting check 2017-01-04 17:51:08 -05:00
KorPhaeron 8542e5b318 Capture the Flag exploit fix 2017-01-04 17:38:36 -05:00
Kyle Spier-Swenson bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00
Cruix 20394282ff Fixed some two-handed weapon bugs (#22457)
* Fixed being able to hold twohanded-required items in one hand
Fixed dualsabers changing their weight_class and hitsound when unsuccessfully wielded

* Fixed ctf flags being unpickupable
2016-12-27 09:13:46 +13:00
Joan Lung 95af0534f6 MMI'd clockcultists put in AI cores will properly lose clockcult status (#22369)
* MMI'd clockcultists put in AI cores will properly lose clockcult

* uuuuugh

* fix the core while we're at it

* "

* mrrp

* this will also follow you around

* hmm
2016-12-25 16:18:55 +13:00
coiax dabcce81ed CTF guns only hurt mobs with CTF armor (#22284)
* CTF guns only hurt mobs with CTF armor

This is moving towards the possiblity of spawning CTF spawns and flag
spawns onto the station without people being caught in the crossfire.

* Debug messages are bad
2016-12-23 09:31:55 +13:00
Shadowlight213 ec387c8258 Fixes active turfs on ruins (#22339)
Fixes infinite loop and runtime with ruin loader running out of ruins to pick from
2016-12-22 09:11:38 +01:00