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
d081a810af
Merge pull request #9565 from AnturK/fixmix
...
Misc Fixes
2015-05-21 17:43:45 +02:00
400d79655a
Merge pull request #9526 from Jordie0608/bugsarethemotheroffeatures
...
Various more bugfixes
2015-05-21 15:45:18 +02:00
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
30b793c84f
Merge pull request #9476 from Firecage/weldingtoolstotoolbelts
...
Changes welder weight classes.
2015-05-21 14:25:09 +02:00
18dfa26419
Fixes renamed wielded items reverting to inital name
2015-05-19 18:15:47 +02:00
8329b10890
Merge branch 'master' of https://github.com/tgstation/-tg-station into bugsarethemotheroffeatures
2015-05-20 01:16:16 +10:00
2e44f37797
Fixes grenade bullshit
2015-05-16 21:53:04 +03:00
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
60843e1d78
fixed bug with chem grenades
2015-05-16 11:02:20 -07:00
64acf95cd9
Merge pull request #9501 from MartiUK/patch-1
...
Fixed lighter text typo
2015-05-16 19:11:28 +02:00
2b9c8ac98c
fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons
2015-05-17 01:58:46 +10:00
4b84cfe73d
Fixes defibrillator breaking after harm use
2015-05-15 23:41:08 -04:00
728f96d2f7
Merge pull request #9480 from Xhuis/invisibleDeathMachine5000
...
Gives pneumatic cannons inhand sprites and logs
2015-05-15 15:08:22 -05:00
099627ca06
Merge pull request #9488 from Aranclanos/rangeTargets
...
Fixes range targets changing icons
2015-05-15 14:56:17 +03:00
91ae33adf4
Fixed lighter text typo
...
Fixes tgstation/-tg-station#9496
2015-05-15 10:47:15 +01:00
3410d3a0f6
Merge pull request #9461 from xxalpha/petethegoat
...
A handful of fixes.
2015-05-15 02:05:16 +03:00
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
a160043d0c
Adds logs for pneumatic cannon.
2015-05-13 21:33:07 -04:00
ba84046ecc
Pneumatic cannon inhand sprites
2015-05-13 14:57:15 -04:00
ba20b8a265
Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine
...
Resolves #1358 , /code/defines/obj.dm reorganization
2015-05-13 09:23:56 -05:00
e854dd146f
Changes welder weight classes.
2015-05-13 13:32:54 +02:00
ec9382c43b
Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13hassomanybugsitcountsasanecosystem
...
Conflicts:
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
2015-05-13 20:01:27 +10:00
a978ee6ba3
Merge pull request #9458 from xxalpha/cyborgtiles
...
Fixed cyborg floor tiles being infinite.
2015-05-13 19:45:45 +10:00
ab16875492
Fixed dualhanded runtime.
2015-05-12 23:55:49 +01:00
0220817b0c
Fix lighter/dropped runtime that happened once.
...
That was no fix. It doesn't need fixing.
2015-05-12 23:45:22 +01:00
e5dfaaf007
Fixed cyborg floor tiles being infinite.
2015-05-11 22:08:16 +01:00
330a24e4f1
Removes unnecessary comma
2015-05-11 16:32:41 -04:00
b8734211d0
Fixes the pneumatic cannon recipe
2015-05-10 12:28:42 -04:00
332419ca31
adds target to do_after
2015-05-10 15:44:54 +10:00
502d21a4da
Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine
...
Conflicts:
tgstation.dme
2015-05-10 14:48:35 +10:00
36be3b6983
Merge pull request #9110 from Xhuis/double_cannons
...
Adds the Pneumatic Cannon
2015-05-09 12:00:45 -05:00
4e787fb980
Merge pull request #9358 from Firecage/Weldersprites
...
New welder sprites and welder name, Fix experimental welder.
2015-05-09 11:26:32 -05:00
1875f3a9c2
Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere
...
Group of fixes
2015-05-09 16:23:46 +02:00
7369992d3d
further reorganization, elimination of old defines folder
2015-05-09 23:16:57 +10:00
9387af3587
Merge pull request #9403 from francinum/patch-1
...
Span Closure
2015-05-09 22:12:04 +10:00
67fe7dc25c
Merge pull request #9396 from Firecage/Nodropmutants
...
Prevents golems and skeletons from dropping due to shards and mousetraps
2015-05-09 22:05:04 +10:00
aafa80dcd8
Merge pull request #9378 from GunHog/diamond_tipped_spirals
...
Fixes the mining borg diamond drill upgrade
2015-05-09 21:45:21 +10:00
4e82cd9689
Merge pull request #9355 from Firecage/OverlaycleanBGone
...
Removes the ability to clean Overlays
2015-05-09 21:30:21 +10:00
45b76d4a26
Merge pull request #9337 from xxalpha/ash
...
Fixed a couple of small problems with smoking pipes.
2015-05-09 20:33:00 +10:00
fdeb84021d
Merge pull request #9320 from GunHog/Botcall_V2
...
Bot performance and PDA features update
2015-05-09 06:26:19 +01:00
f0003cd7d4
Merge pull request #9385 from optimumtact/forkingfantastic
...
Fork eating no longer requires mouth zone sel
2015-05-08 15:51:43 -05:00
e71106ad13
Merge pull request #9289 from Xhuis/now_he's_poorly_from_too_much_electric
...
Adds a second functionality to the emagged defibrillator
2015-05-08 22:10:49 +10:00
939ceae37d
Closes the <span> tag
2015-05-07 21:26:31 -04:00
3e540dafdc
Adds D4 to the HARDFEET mix.
2015-05-07 18:43:50 +02:00
1fb8dcecd1
Prevents golems and skeletons from dropping due to shards and mousetraps
2015-05-07 15:44:17 +02:00
d28cd28426
Merge pull request #9315 from kingofkosmos/attackmsgfix
...
Removes unnecessary attack-messages
2015-05-06 22:34:30 -05:00
58c460a361
Fork eating no longer requires mouth zone sel
...
Instead, if there is a fork load you will simply eat the fork load.
2015-05-07 15:13:06 +12:00
45f2336413
Fixes the mining borg diamond drill upgrade
...
- Made the borg diamond drill upgrade a child of the standard borg
mining drill.
2015-05-06 10:09:57 -05:00
46b2fe33af
Merge pull request #9291 from Ikarrus/gangmind
...
Gang Update
2015-05-06 10:04:26 -05:00
phil235