Commit Graph

7166 Commits

Author SHA1 Message Date
Jordie0608 e82c02744e paerbin clickdown, removed protectstation, rounded ui chem/plasma count, non-mob hivebot beacon 2015-05-27 16:54:13 +10:00
Jordie0608 0cafaf9373 zeroth laws can be removed with core boards 2015-05-27 12:09:09 +10:00
Cheridan 5f22a3c025 fixes weapons auth button 2015-05-26 15:22:24 -05:00
kingofkosmos a90fc31df1 Medical scanner output changes. Rounding, capitalization, grammar etc.
Minor changes to gas scanner output.
2015-05-26 21:44:32 +03:00
Cheridan c4254a727d Merge pull request #9638 from CosmicScientist/EnglishFixes
Fixed some general spelling and grammar
2015-05-26 03:53:37 -05:00
Carl Ivanov 8122ddc94f Delete ID's when PDA destroys. 2015-05-26 17:01:00 +09:00
Remie Richards 373c72773f Merge pull request #9617 from Miauw62/maniasureamgoodatcomingupwithgooddescriptivebranchnamesdontyouthinksobecausethisbranchnameisverygoodanddescriptive
Makes all machines use the robot font.
2015-05-25 18:31:15 +01:00
Cheridan fb2beca318 Merge pull request #9602 from Aranclanos/AItracking
Fixes all possible exploits with the AI tracking href link
2015-05-24 23:26:31 -05:00
Cheridan 053e26c221 Merge pull request #9454 from spasticVerbalizer/heatproofAirlocks
Un-snowflakes heat-proofing glass airlocks, fixes #9437
2015-05-24 21:22:50 -05:00
Cheridan f12f12ed60 Merge pull request #9562 from Aranclanos/newscaster
Newscaster code big cleanup.
2015-05-24 19:47:05 -05:00
Cheridan ad8750eeb7 Merge pull request #9615 from phil235/RuntimesFixes
Runtime fixes and stuff.
2015-05-24 19:40:53 -05:00
CosmicScientist a94075d07d Edited pAIcard displayed message, donksoft dart description and some tips of the round. 2015-05-24 20:49:06 +01:00
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
Miauw f630cce730 Makes all machines use the robot font. Fixes #8575 2015-05-23 18:15:26 +02:00
phil235 ec6e318343 Fixes extinguisher (w/safety off) spraying water when placed on a table.
Fixes runtime when putting beaker in autolathe.
Fixes spray can empty message appearing when placing it on a table.
Fixes experimentor manual not having a title.
Fixes runtime with engine goggles updating nearby objects visibility.
Fixes runtime when looking at picture from the AI camera.
Updating the 'can_be_placed_into' list for items so their afterattack don't do anything when placing them in experimentor, autolathe, destructive analyzer.
Fixes soap starting to clean the table when placed on it.
Fixes drinking glasses having capitalized names.
2015-05-23 16:03:48 +02:00
Aranclanos 9b4b6bc1a6 Fixes all possible exploits with the AI tracking href link
Fixes 1128
Changes the href link of the AI tracking to be just the name displayed in-game instead of the reference of the mob.
Removes faketrack from atom/movable/virtualspeaker as it becomes useless.
2015-05-22 11:26:43 -03:00
phil235 d081a810af Merge pull request #9565 from AnturK/fixmix
Misc Fixes
2015-05-21 17:43:45 +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
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
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 18dfa26419 Fixes renamed wielded items reverting to inital name 2015-05-19 18:15: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
Aranclanos fe4d28a376 Newscaster code big cleanup.
Removes lots of copypaste.
Admin newscaster barely modified, they still are a gigantic copypaste from the topic.dm() of the newscaster object.
Printed diaries will now only report the information available when they were printed, including wanted status and the different types of censorship.
All datums are now under /datum/newscaster
Wanted is now a different type of datum, /datum/newscaster/wanted_message
Fixed a bug where you couldn't censor normal submissions, made by crewmembers.
Fixes #944
2015-05-19 09:32:46 -03:00
xxalpha adccdd38e9 Made a proc and fixed other buggy items. 2015-05-19 00:28:15 +01:00
xxalpha dca4fbbefd Fixed storages contents not updating in some cases. 2015-05-18 23:40:14 +01:00
Firecage 3cd212502f Makes the Janicart, Roller bed, and office Chair not 'immune' to spacewind. 2015-05-18 23:35:19 +02: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
xxalpha 62426279b4 Added department security spawn points and fixed dep sec spawning. 2015-05-16 22:20:31 +01:00
Remie Richards cf536a9c16 Ports /vg/s Smoothwall code, Angry all caps comments from N3X15 included. 2015-05-16 21:05:18 +01:00
Remie Richards 0b91b14f70 Fixes debug verb Check Bomb Impact 2015-05-16 19:56:46 +01: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
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
Jordie0608 2b9c8ac98c fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons 2015-05-17 01:58:46 +10:00
Xhuis 4b84cfe73d Fixes defibrillator breaking after harm use 2015-05-15 23:41:08 -04: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 9dfc13cbb7 Merge pull request #9491 from RemieRichards/ManyImageCaches
Misc Image Caches
2015-05-15 13:44:21 -05:00
Razharas 099627ca06 Merge pull request #9488 from Aranclanos/rangeTargets
Fixes range targets changing icons
2015-05-15 14:56:17 +03: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
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
Xhuis ba84046ecc Pneumatic cannon inhand sprites 2015-05-13 14:57:15 -04:00
Cheridan ba20b8a265 Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine
Resolves #1358, /code/defines/obj.dm reorganization
2015-05-13 09:23:56 -05:00
Firecage e854dd146f Changes welder weight classes. 2015-05-13 13:32:54 +02:00