phil235
f643769ef4
Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life().
2015-05-23 22:34:04 +02:00
Jordie
7dc4a9cfa0
Merge pull request #9586 from MrStonedOne/patch-13
...
[ready]Workaround for Out of resources byond bug
2015-05-22 16:59:18 +10:00
MrStonedOne
addb63adad
Utterly guts the use of .locs from the game.
...
They
This means that multi-tile things may not handle correctly, but the only thing that used it was atmos for double wide doors, and they are used in one location that is unlikely to have atmos changes
see: http://www.byond.com/forum/?post=1852790 for justifcation. (tl;dr: accessing .locs causes memory leaks)
2015-05-21 23:41:47 -07:00
MrStonedOne
8ac7f47caa
Minor workaround for the runtime in get_turf on world new.
...
Adding this second check for turf_candidate being null FOR SOME FUCKING REASON is needed.
2015-05-21 23:39:04 -07:00
phil235
d081a810af
Merge pull request #9565 from AnturK/fixmix
...
Misc Fixes
2015-05-21 17:43:45 +02:00
phil235
819525b4f5
Merge pull request #9542 from kingofkosmos/mechspacedrillfix
...
Makes mechs unable to drill space
2015-05-21 17:32:13 +02:00
phil235
00dbce5ba6
Merge pull request #9539 from MrStonedOne/patch-12
...
Quick fix for cryo.
2015-05-21 16:38:48 +02:00
phil235
81948d5f8c
Merge pull request #9505 from Firecage/rainbowjumpsuit
...
This fixes the issue of colored jumpsuits not being dyeable into rainbow jumpsuits.
2015-05-21 16:20:38 +02:00
phil235
802ff2dfa6
Merge pull request #9464 from Firecage/reinforcedfloorfix
...
Fixes infinite rods from reinforced floors
2015-05-21 16:01:20 +02:00
phil235
a268f43e16
Merge pull request #9472 from Xhuis/cultCommFixAgain
...
Fixes cult comms... again.
2015-05-21 15:58:40 +02:00
phil235
37abaffb50
Merge pull request #9431 from Incoming5643/wizard_fizard
...
Blacklists a few races to make spontanious race changes suck a little less
2015-05-21 15:52:48 +02:00
phil235
400d79655a
Merge pull request #9526 from Jordie0608/bugsarethemotheroffeatures
...
Various more bugfixes
2015-05-21 15:45:18 +02:00
phil235
22cad01c73
Merge pull request #9515 from Xhuis/now_he's_poorly_mk2
...
Fixes defibrillator breaking after being used for harm with safety off
2015-05-21 14:40:23 +02:00
phil235
30b793c84f
Merge pull request #9476 from Firecage/weldingtoolstotoolbelts
...
Changes welder weight classes.
2015-05-21 14:25:09 +02:00
MrStonedOne
b6451cce1b
fixes compile error (hopefully)
2015-05-21 02:58:58 -07:00
MrStonedOne
6e29c4464f
Workaround for Out of resources byond bug
2015-05-21 02:21:25 -07:00
Incoming
fd17e5fd57
Fixes a critical bug where clicking on a closed closet that can't be opened (welded most likely) would lead to an infinite loop of attacking attackby and attack_hand until the mob pulled away from the closet. Eating too many of these errors causes the server to cry for mercy and shut down. Meaning of course that EVERY PLAYER IN THE GAME WHO READS THIS PULL CAN NOW CRASH THE GAME AT THIER LEISURE.
...
So yeah merge quick please.
2015-05-20 23:00:28 -04:00
Swag McYolosteinen
b6ec3d1036
Merge pull request #9452 from Cheridan/thickmaterial
...
Tangential THICKMATERIAL-related fixes
2015-05-20 16:13:41 +02:00
Cheridan
39cceeda91
Merge pull request #9549 from phil235/PosibrainMsgFix
...
Fixes the ghost message from posibrain
2015-05-20 09:09:08 -05:00
Cheridan
7a14c14fc5
Merge pull request #9504 from Aranclanos/airlockController
...
Airlock controller revamp
2015-05-20 09:02:10 -05:00
Cheridan
ce9f2be8f9
Merge pull request #9534 from Iamgoofball/patch-67
...
Fixes a few chems having incorrect sleep values, and fixes some flags on Ephed and Stimulants
2015-05-20 08:22:48 -05:00
Cheridan
82b290ffd5
Merge pull request #9557 from kingofkosmos/altclickghosttogglefix
...
Alt-click-toggles now do proper checks
2015-05-20 08:03:25 -05:00
AnturK
8461818c4a
Fixes statues not being able to attack/move in darkness
2015-05-19 19:59:34 +02:00
AnturK
18dfa26419
Fixes renamed wielded items reverting to inital name
2015-05-19 18:15:47 +02:00
AnturK
2d6e01b547
Fixes statues moving in front of mechs
2015-05-19 17:43:47 +02:00
Jordie0608
8329b10890
Merge branch 'master' of https://github.com/tgstation/-tg-station into bugsarethemotheroffeatures
2015-05-20 01:16:16 +10:00
Jordie0608
ffcba8cb61
damp rag can now inject or apply reagents
2015-05-20 01:12:16 +10:00
kingofkosmos
494403969e
Alt-click-toggles now do proper checks
...
Such as if you're near the thing, conscious, alive etc.
Fixes #9238
2015-05-18 20:22:04 +03:00
Cheridan
dbb2999c85
Merge pull request #9536 from xxalpha/departmental_oppression
...
Fixed departmentental security spawning.
2015-05-18 08:37:52 -05:00
Cheridan
19d7b9b2d0
Merge pull request #9508 from Firecage/Dronehandswap
...
Allows drones to use middleclick to swap their hands.
2015-05-18 08:15:12 -05:00
Cheridan
459b3c2c39
Merge pull request #9511 from Aranclanos/Firelocks
...
Increases firelock layer when closed
2015-05-18 08:11:32 -05:00
Cheridan
d6bd15ee66
Merge pull request #9532 from Incoming5643/almostcompletelybugfree
...
Fixes lings getting implanted roles specifically in traitorling
2015-05-18 08:02:23 -05:00
phil235
8799b8182e
Fixes the ghost message from posibrain built with the exosuit fabricator. It will now correctly mention the area where the posibrain was created.
2015-05-18 00:27:59 +02:00
Jordie0608
84eaa17ec9
reset ooc color buttons, changes how default color for admins is handled
2015-05-17 22:10:46 +10:00
kingofkosmos
353dd23143
Added a check so mechs aren't able to drill space.
2015-05-17 14:08:39 +03:00
Cheridan
46f2721cdf
Merge pull request #9518 from bear1ake/dat-nuke-invisible-disk
...
Fix #9507
2015-05-16 23:31:53 -05:00
MrStonedOne
496e3d0989
Quick fix for cryo.
...
Moving this to machery process just seems dirty, but it works until somebody else with the time or care can figure something out about that expel gas proc.
2015-05-16 18:23:13 -07:00
xxalpha
62426279b4
Added department security spawn points and fixed dep sec spawning.
2015-05-16 22:20:31 +01:00
Iamgoofball
da63a8acc6
Fixes some med bugs too
2015-05-16 13:07:30 -07:00
Iamgoofball
479f38fb61
Fixes a few chems having incorrect sleep values
...
phil forgot to change some of these when doing 1tick
2015-05-16 13:04:25 -07:00
Alek2ander
2e44f37797
Fixes grenade bullshit
2015-05-16 21:53:04 +03:00
Iamgoofball
630ece06d0
One day while Andy was masturbating, Woody got wood. He could no longer help himself! He watched as Andy stroked his juicy kawaii cock. He approached Andy which startled him and make him pee everywhere on the floor and on Woody too. Being drenched in his urine made him harder than ever! Woody: "Andy Senpai! I'm alive and I want to be INSIDE OF YOU." Andy: "Oh Woody Chan! I always knew you were alive! I want to stuff you up my kawaii ass!" Woody grabbed a bunch of flavored lube and rubbed it all over his head Woody: "Oh my! It's cherry flavored lube! Cherry is my favorite! Woody then stuffed his head up into Andy's tight ass! The other toys around the room watched intently as Woody shoved his head back and forth into Andy's nice ass, continuously making a squishy wet noise. The other toys also became aroused and they all gathered around Woody and Andy and started to urinate all over them, and then they started to masturbate. Andy: "Oh my goodness, Woody Chan! You are churning my insides up so well! Your nose is stimulating my prostate! OH YES! All the other toys became so aroused by this, that they could not help themselves anymore! They pushed Woody completely inside, and they all went inside. All of them wanted to be inside Andy's nice round ass. Andy: "No wait guys! My ass cannot hold this much! I'm getting so full! All the toys went inside of poor squirming Andy and pretty much, he was beyond full, and died from having his insides completely damaged. The mother came inside and found Andy, dead with a huge ass hemorrhage on his anus, with a HUGE belly full of toys.
...
One day while Andy was masturbating, Woody got wood. He could no longer help himself! He watched as Andy stroked his juicy kawaii cock. He approached Andy which startled him and make him pee everywhere on the floor and on Woody too. Being drenched in his urine made him harder than ever! Woody: "Andy Senpai! I'm alive and I want to be INSIDE OF YOU." Andy: "Oh Woody Chan! I always knew you were alive! I want to stuff you up my kawaii ass!" Woody grabbed a bunch of flavored lube and rubbed it all over his head Woody: "Oh my! It's cherry flavored lube! Cherry is my favorite! Woody then stuffed his head up into Andy's tight ass! The other toys around the room watched intently as Woody shoved his head back and forth into Andy's nice ass, continuously making a squishy wet noise. The other toys also became aroused and they all gathered around Woody and Andy and started to urinate all over them, and then they started to masturbate. Andy: "Oh my goodness, Woody Chan! You are churning my insides up so well! Your nose is stimulating my prostate! OH YES! All the other toys became so aroused by this, that they could not help themselves anymore! They pushed Woody completely inside, and they all went inside. All of them wanted to be inside Andy's nice round ass. Andy: "No wait guys! My ass cannot hold this much! I'm getting so full! All the toys went inside of poor squirming Andy and pretty much, he was beyond full, and died from having his insides completely damaged. The mother came inside and found Andy, dead with a huge ass hemorrhage on his anus, with a HUGE belly full of toys.
2015-05-16 11:21:41 -07:00
Incoming
677f3df6c9
fixes a missed change from #9364 in relation to lings in traitorling
2015-05-16 14:20:47 -04:00
MrStonedOne
60843e1d78
fixed bug with chem grenades
2015-05-16 11:02:20 -07:00
phil235
64acf95cd9
Merge pull request #9501 from MartiUK/patch-1
...
Fixed lighter text typo
2015-05-16 19:11:28 +02:00
phil235
579cc5b38e
Merge pull request #9502 from MartiUK/issue9492
...
Fix microwave cleaning typo.
2015-05-16 19:11:18 +02:00
Jordie0608
2b9c8ac98c
fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons
2015-05-17 01:58:46 +10:00
bear1ake
723d37d993
Fix #9507
...
Fixes nuke disk missing sprite
2015-05-16 18:20:51 +09:00
Xhuis
4b84cfe73d
Fixes defibrillator breaking after harm use
2015-05-15 23:41:08 -04:00
Aranclanos
c0fb324940
Firelocks will now have a higher layer than doors when closed, they won't need any more special checks to reach them because an airlock is on top of them.
...
New variable for doors, closingLayer, on firedoors its 3.11 and normal doors on their classic 3.1
Fixes issue #412
2015-05-15 20:21:22 -03:00