Commit Graph

16574 Commits

Author SHA1 Message Date
Dorsisdwarf
fc88bce4b6 sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it 2015-06-05 14:05:32 +01: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
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
Cheridan
46f2721cdf Merge pull request #9518 from bear1ake/dat-nuke-invisible-disk
Fix #9507
2015-05-16 23:31:53 -05: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
bear1ake
723d37d993 Fix #9507
Fixes nuke disk missing sprite
2015-05-16 18:20:51 +09: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
Cheridan
ee02c90b74 Mech syringe guns check THICKMATERIAL 2015-05-15 18:06:53 -05:00
Cheridan
112e1d0810 Merge pull request #9487 from Aranclanos/tipoftheday
Fixes the tip of the round not being 30 seconds before the round start
2015-05-15 15:57:40 -05:00
Firecage
1d5b06291e Allows drones to use middleclick to swap their hands. 2015-05-15 22:33:18 +02:00
Cheridan
728f96d2f7 Merge pull request #9480 from Xhuis/invisibleDeathMachine5000
Gives pneumatic cannons inhand sprites and logs
2015-05-15 15:08:22 -05:00
Cheridan
e784f6dbf0 Merge pull request #9489 from Jordie0608/youcantstopthefixesmal
Bugfixes Episode III: Revenge of the code
2015-05-15 14:13:00 -05:00
Cheridan
51b01c37a5 Merge pull request #9467 from Firecage/whiteshipfix
This fixes the issue of the white ship shuttle console
2015-05-15 13:55:35 -05:00
Cheridan
9dfc13cbb7 Merge pull request #9491 from RemieRichards/ManyImageCaches
Misc Image Caches
2015-05-15 13:44:21 -05:00
Cheridan
989d4902f5 Merge pull request #9469 from RemieRichards/ReagentColours
Ports /vg/ chem weighted colour averaging
2015-05-15 12:41:33 -05:00
Cheridan
69eb118653 Merge pull request #9478 from GunHog/A_Poisitive_Change
Posibrain activation tweaks
2015-05-15 12:25:22 -05:00
Cheridan
ad281d6a32 Merge pull request #9240 from Firecage/SimpleAnimalClownsHumanCorpses
Makes Simple Animal Clowns drop Human Clown corpses.
2015-05-15 12:09:09 -05:00
Aranclanos
4f391ff6ff Revampes airlocks normal controllers (virology and incinerator doors at the current map)
The old controller and access buttons are replaced by:
-/obj/machinery/doorButtons/airlock_controller
-/obj/machinery/doorButtons/access_button
Hopefully the path doorButtons will be the base for the replacement of the airlock controllers who are left
The new controllers do not use radios at all, they link the doors with simple variables
Fixes issue #267
The new controllers will not correct the airlocks state (open/close) on their process, they will only do it when ordered by the user
If any door is missing, the door left will act like a single door correctly
Cases where the doors modify themselves of powers go out while the controller is activated are covered to stop it
Added a new sprite for the access_button, to represent lack of power
The controller and the access button will now have animations using old unused sprites.
The old computer datum used by the old controller is removed
Map changes to replace the paths in the incinerator and virology airlock controllers
Added a bolt() and unbolt() procs for airlocks
The controller will search for the airlocks on initialization instead of each time the button is activated
2015-05-15 11:28:37 -03:00
Razharas
099627ca06 Merge pull request #9488 from Aranclanos/rangeTargets
Fixes range targets changing icons
2015-05-15 14:56:17 +03:00
GunHog
50bd5ae744 Fixes 9500
- Prevents one user stealing the posibrain of another if they both open
and accept the prompt at the same time.
2015-05-15 06:49:02 -05:00
Martin Kemp
092c8238c0 Fixed cleaning microwave typo.
Fixes #9492.
2015-05-15 12:05:02 +01:00
Martin Kemp
91ae33adf4 Fixed lighter text typo
Fixes tgstation/-tg-station#9496
2015-05-15 10:47:15 +01:00
Razharas
3410d3a0f6 Merge pull request #9461 from xxalpha/petethegoat
A handful of fixes.
2015-05-15 02:05:16 +03:00
Remie Richards
28cd8ea0f1 Image Caches:
Mining rock turf edge overlays
Alien weed overlays
SMES overlays
2015-05-14 16:40:15 +01:00
Jordie0608
339f892ad2 corgi collar, facehugger and icecreamsandwich fix 2015-05-14 22:29:53 +10:00
Swag McYolosteinen
287de468ff Merge pull request #9296 from RemieRichards/VentcrawlingFixes
Ventcrawling Fixes
2015-05-14 12:25:11 +02:00
Aranclanos
965ebdaed8 Fixes range targets changing icons
Fixes issue #129
Removed the unused /datum/bullethole
Removed some copypaste code inbetween the targets and the target stakes
Made these objects not search for eachother in the nearby turfs, they both link to eachother now
Added removeOverlays() and nullPinnedLoc() procs for /obj/item/target
Added removeTarget() and nullPinnedTarget() procs for /obj/structure/target_stake
Added a huge list of additions to the commit log that nobody will read
Cleaned up the code for both objects (target and target stakes)
2015-05-14 03:30:32 -03:00
Xhuis
a160043d0c Adds logs for pneumatic cannon. 2015-05-13 21:33:07 -04:00
Aranclanos
2eb6a202d7 Fixes the tip of the round not being 30 seconds before the round starts. It was at 3. 2015-05-13 21:41:27 -03:00
xxalpha
4da1eb4399 Fixed emitter beams not being reflectable. 2015-05-13 21:45:46 +01:00
xxalpha
79c96e1bf1 Fixed emitter beam esword reflection runtime error. 2015-05-13 21:16:52 +01:00
Xhuis
ba84046ecc Pneumatic cannon inhand sprites 2015-05-13 14:57:15 -04:00
GunHog
9c370c75e8 Posibrain activation tweaks
- Ghosts will now get a link that allows them to enter a Positronic
Brain as part of the notification message.
- Human players can now manually activate Poistronic Brains to notify
the ghosts again.
- Ghost notification for Positronic Brains now has a global cooldown of
one minute.
2015-05-13 12:20:07 -05:00