Commit Graph

33240 Commits

Author SHA1 Message Date
PJB3005 3c8b98a3aa 9/11 2017-02-08 15:07:58 +01:00
PJB3005 8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
PJB3005 9228e01168 I forgot to pull 2017-02-08 14:18:54 +01:00
Cyberboss b9b05af70e || -> && 2017-02-08 00:42:45 -05:00
Leo 48349a8ac5 Tweaks the ircadminwho proc so it doesn't add a comma to the end of the message (#23799)
* Tweaks the irc admin who proc so it doesn't add a comma to the end of the list

* Learns how to code
2017-02-08 18:33:51 +13:00
oranges 6f2604401e Merge pull request #23803 from Cyberboss/patch-13
Fixes a parallax preferences runtime
2017-02-08 18:32:47 +13:00
oranges fc3c46bc8d Merge pull request #23804 from Cyberboss/patch-14
Fixes a runtime with sec huds
2017-02-08 18:32:32 +13: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
gt33 8c4b51b419 More (silly) abductee objectives (#23726)
* Move my silly sintouched objectives to Abductee, because it's more appropiate.

* Feedback told me to!
2017-02-08 18:31:33 +13:00
Jordie ae5ca631f8 Watchlist entries filtering, non-deleting messages (#23737)
* adds watchlist filtering to online clients, messages no longer delete self

* message-sent > message sent

* missed var
2017-02-08 18:30:51 +13:00
Joan Lung ea55e43438 Ratvar and Nar-Sie will no longer bounce off directional windows like birds (#23749)
* Ratvar and Nar-Sie will no longer bounce off directional windows like birds

* heh??
2017-02-08 18:30:31 +13: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 bf0e7abf5c Merge pull request #23757 from Cyberboss/patch-17
Gives the do_after family callbacks
2017-02-08 18:29:20 +13:00
oranges de802082f0 Merge pull request #23764 from Core0verload/comm_console
Comm console no longer shows "Unable to trace" if the shuttle was never called
2017-02-08 18:28:56 +13: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
kevinz000 5f7d6844fa Fixes emitter pulsing firing beams without actually needing energy (#23774)
* Update emitter.dm

* Update emitter.dm

* Update emitter.dm
2017-02-08 18:28:14 +13:00
oranges 76b13aebd7 Merge pull request #23779 from Tofa01/ViroMedJob-Master
Removes Access To Virology Access From Medical Staff Who Don't Need It
2017-02-08 18:27:54 +13:00
oranges 8b6e3271cf Merge pull request #23782 from Cyberboss/Firedoordoafter
Set frequency in playsound. Add useless knocking on closed firedoors
2017-02-08 18:26:54 +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
oranges d4df8337e0 Merge pull request #23792 from ChangelingRain/apcfireimmunity
APCs are now immune to fire
2017-02-08 18:25:31 +13:00
oranges 579c39016a Merge pull request #23793 from Cyberboss/DEEPER
Makes find_references go DEEP
2017-02-08 18:25:10 +13:00
kevinz000 a8116c4f29 [READY]Sends the names of online admins when sending IRC alerts about no admins active. (#23712)
* Update adminhelp.dm

* Update world.dm

* Update ticker.dm

* should work.
2017-02-08 18:23:32 +13:00
oranges f360005e37 Merge pull request #23703 from coiax/borg-module-tweaks
Standard and engineering module tweaks
2017-02-08 18:23:13 +13:00
Xhuis 9662b53334 Soapstones now have a fixed vocabulary (and rating system!) (#23717)
* Soapstone message vocabulary, refactors, and more

* Changes message sprite and deletion, adds suffixes

* Removes sounds and sprites for a new PR

* Removes self-rating

* Now with compiling!

* Compiling in 2017 LUL

* Re-adds message removal functionality

Through shoddy editor code, of course

* Fixes a message not appearing
2017-02-08 18:22:53 +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
Remie Richards 9dc819f151 Skewium: It'll fuck you up. (#23742)
* Skewium: It'll fuck you up.
Adds some matrix helpers for dealing with skews
Adds Skewium, it's like rotatium, but for skews instead of rotation, it's horrible

* switches back to boxstation from runtimestation
2017-02-07 16:36:07 -06: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
Cyberboss cfd836bdc4 Fixes a dismemberment runtime (#23791) 2017-02-07 16:30:46 -06:00
Cyberboss 9ab72ea6c9 Fixes a runtime qdeling hooded outfits (#23789) 2017-02-07 16:29:50 -06:00
Cyberboss 8162ced2f9 Fixes a teleportation runtime (#23790) 2017-02-07 16:26:39 -06:00
Xhuis c038691d10 Adds the reverse revolver for traitor clowns (#23763)
* Adds the reverse revolver for traitor clownes

* [user.p_them()]self

* ()
2017-02-07 16:26:04 -06:00
Leo dba633c218 Romerol no longer have a chance of discount (#23801) 2017-02-07 16:24:38 -06:00
Joan Lung 4bc08fa782 Firedoors now actually block fire and are immune to fire (#23768) 2017-02-07 16:22:41 -06:00
kevinz000 aa0b131e3c Nerfs tesla coil instakills (#23773)
* Update coil.dm

* Update coil.dm

* Update coil.dm

* Update coil.dm
2017-02-07 16:17:21 -06:00
PKPenguin321 066112c3e5 fixes sink grammar with monkey cubes (#23761) 2017-02-07 16:16:58 -06:00
Cyberboss 18073f8880 Fixes stacks being deleted when merged in storage (#23758) 2017-02-07 16:16:42 -06:00
Cyberboss 44e6c208b0 Makes find_references go DEEP 2017-02-07 14:13:32 -05:00
Joan Lung 3d32ed0bdd Merge pull request #23747 from Cyberboss/patch-15
[s]Fixes race condition with unreadying at start
2017-02-07 12:28:30 -05:00
Cyberboss e335b2ce43 Fixes atoms being initialized twice with templates (#23746) 2017-02-07 15:35:20 +01:00
Leo 1b75e13b11 Adds a new button for admins, the SMITE BUTTON (#23767)
* Adds a new button for admins, the SMITE BUTTON

* Adds a check after input
2017-02-07 08:26:08 -06:00
Joan Lung e1883fb218 Fixes Ratvarian "and" matches catching things they shouldn't (#23748)
* Fixes Ratvarian "and" matches catching things they shouldn't

* this shouldn't matter

* wait why don't I just do this if we're not catching hand/etc

* oh, of course, we need to match that

* \s is caught by \W
2017-02-06 20:35:43 -06:00
Cyberboss 1c98d709b4 Fixes a runtime with sec huds 2017-02-06 21:27:36 -05:00
Cyberboss 8e4681dd9c Fixes a parallax preferences runtime 2017-02-06 21:23:10 -05:00
Joan Lung 14253d7c2b APCs are now immune to fire 2017-02-06 16:19:40 -05:00
swindly bc5937cb03 makes organs robotic (#23756) 2017-02-06 15:16:29 -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 59f18230b9 Allows useless knocking on firedoors 2017-02-06 12:10:59 -05:00
Cyberboss b0f9f70199 Add frequency param to playsound 2017-02-06 12:05:37 -05:00
tofa01 a191750d7b Removes access to virology for medical staff who dont need it. 2017-02-07 00:40:03 +11:00