Commit Graph

3133 Commits

Author SHA1 Message Date
Cheridan
9e65cdeb6a Merge pull request #9391 from Ikarrus/gangmessaging
Gang-Wide Messages
2015-06-05 22:01:54 -05:00
Cheridan
05072bcf31 Merge pull request #9771 from xxalpha/dropitlikeits
Fixed PDA accepting items when spessmen can't drop items.
2015-06-04 20:04:04 -05:00
xxalpha
ecb15b21c2 Fixed PDA accepting items when spessmen can't drop items. 2015-06-03 20:16:11 +01:00
Cheridan
e4999fd233 Merge pull request #9719 from CandyClownTG/patch-1
Ointments and bruise packs stacking
2015-06-03 00:51:02 -05:00
Cheridan
a19f1801ff Merge pull request #9699 from KorPhaeron/turf
Changes how destroying/building turfs works
2015-06-02 23:15:42 -05:00
Cheridan
2d998452db Merge pull request #9715 from Firecage/datumspaths
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
2015-06-02 23:04:51 -05:00
Cheridan
d31f534446 Merge pull request #9745 from Incoming5643/super_bummer_man_64
Fixes overexcited TTV reporting
2015-06-02 22:04:20 -05:00
Cheridan
905f350597 Merge branch 'unsimulatedIsKill2' of git://github.com/Aranclanos/-tg-station into Aranclanos-unsimulatedIsKill2
Conflicts:
	code/game/smoothwall.dm
2015-06-02 13:45:56 -05:00
Incoming
e608a16edf Tank Transfer Valves won't pester the admins if the volume of the two tanks are equivilent before they are mixed. 99999/100000 times this means that the tank was already opened once and fouled, and the remaining 1/100000 the toxins guy was AMAZINGLY crap at his job. 2015-06-01 23:11:42 -04:00
Aranclanos
e7c0d7e95c Removes unsimulated turfs.
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
Incoming
061478165a upgrades the HARDFEET species flag to PIERCEIMMUNE
In addition to keeping golem feet safe as always golems are now immune to object embeding. As a mitagating nerf and logical extension, golems can no longer be injected with chems either.
2015-05-31 18:54:30 -04:00
Cheridan
e3b92f0caf Merge pull request #9656 from bear1ake/pda-id-drop-fix-2
Fix for #4219. Variant 2
2015-05-31 14:35:00 -05:00
Cheridan
426fa3c18d Merge pull request #9680 from kingofkosmos/healthscannerchanges
Health analyzer output reordering
2015-05-31 14:12:09 -05:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
CandyClownTG
b158d35536 Update medical.dm
Ointments and bruise packs are now in stacks of 6 instead of 5.
2015-05-31 02:37:07 -04:00
Firecage
84e8690ec6 merge conflict fix 2015-05-31 02:45:46 +02:00
Firecage
3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
kingofkosmos
0588647ba4 Switched up the order of shown damages. 2015-05-30 11:37:22 +03:00
KorPhaeron
bfe5e4a855 Cleaning up turf code
Changes colons and spaces I forgot you could do this on github
2015-05-29 19:27:28 -05:00
KorPhaeron
97990c94cc Changes how destroying turfs works
Turfs now have a baseturf var which determines what is "under" every
turf. The default is space.

Actions that previously did changeturf(/turf/space) (like bombs or RCD
deconstruction) now do changeturf(baseturf). Functionally the same for
the station, but allows special turf types that don't break to space
(such as planet tiles).

Right now the asteroid tiles are the only thing with a baseturf other
than space (the baseturf is an asteroid tile).

Baseturf is tracked when new things are built, so building a floor and
then a wall on the asteroid tile, and then bombing that wall will return
it to an asteroid tile, not space.

Allows building on asteroid tiles now that doing so wont randomly make
holes to space. Time for giant mining forts.

I should have done this years ago for away missions.

Also added myself to admins.txt
2015-05-29 18:43:34 -05:00
Razharas
6f86281d0e Merge pull request #9660 from Cheridan/auth_button
fixes #9599 weapons auth button
2015-05-29 15:15:16 +03:00
Cheridan
10f2b7ae00 Merge pull request #9559 from xxalpha/cardtrick
Card deck fixes and storage fixes.
2015-05-28 21:41:00 -05:00
kingofkosmos
361693d7f8 Reordered stuff. 2015-05-28 20:48:23 +03:00
duncathan
f4f5ccae61 cleanup of various unused/useless things
removed unused pipe vars alert_pressure, fatique_pressure, maximum_pressure
moved pipe vars maximum_temperature_difference, thermal_conductivity to h/e pipes
removed insulated pipes, as they are identical to simple pipes in every way
removed insulated pipes from RPD.dm, pipe_dispenser.dm and construction.dm
removed red_pipe.dmi
changed instances of insulated pipes on box (whyyyy) to simple pipes
2015-05-27 18:12:12 -06: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
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
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
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
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
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