cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 06:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,557 Commits 61 Branches 14 Tags
fc88bce4b6070bfd8be7df8ebdc7b7e40d025f39
Commit Graph

5115 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
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
xxalpha
62426279b4 Added department security spawn points and fixed dep sec spawning. 2015-05-16 22:20:31 +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
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
Jordie0608
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
Jordie
01ad517894 Merge pull request #9457 from Cheridan/hoes 
KEEP YOUR HOES IN LINE
 2015-05-13 19:50:18 +10:00
Jordie
a978ee6ba3 Merge pull request #9458 from xxalpha/cyborgtiles 
Fixed cyborg floor tiles being infinite.
 2015-05-13 19:45:45 +10:00
Jordie
f36d76167c Merge pull request #9444 from Xhuis/cannonBuildFix 
Fixes the pneumatic cannon recipe not working
 2015-05-13 19:45:00 +10:00
Jordie
d5be3018c1 Merge pull request #9353 from Firecage/Pickupverb 
Allows you to pick up stuff with the verb while buckled.
 2015-05-13 19:41:53 +10:00
xxalpha
ab16875492 Fixed dualhanded runtime. 2015-05-12 23:55:49 +01:00
xxalpha
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
xxalpha
e5dfaaf007 Fixed cyborg floor tiles being infinite. 2015-05-11 22:08:16 +01:00
Cheridan
f3e91beba6 KEEP YOUR HOES IN LINE 2015-05-11 15:58:18 -05:00
Xhuis
330a24e4f1 Removes unnecessary comma 2015-05-11 16:32:41 -04:00
Jordie0608
7357a10f68 more fixes 2015-05-11 20:27:16 +10:00
Xhuis
b8734211d0 Fixes the pneumatic cannon recipe 2015-05-10 12:28:42 -04:00
Jordie
bd12598404 Merge pull request #9376 from spasticVerbalizer/stackingFalseWalls 
Adds check to prevent false wall stacking, fixes #6449
 2015-05-11 00:07:11 +10:00
spasticVerbalizer
040fd7d8b7 Change uses of 'usr' to 'user', move checking of wall up so the message actually shows 2015-05-10 13:31:10 +02:00
Jordie0608
f36d6bec08 fixes false rwalls not smooting, actually fixes barnyard improving 2015-05-10 21:17:46 +10:00
Remie Richards
7e0e50302a Merge pull request #9436 from MrStonedOne/powerfixes 
Merges power subsystem into machine subsystem.
 2015-05-10 08:23:20 +01:00
MrStonedOne
c6c7237265 Merges power subsystem into machine subsystem. 
This is to avoid issues from when they fire out of sync, since powernets assume machine's subsystem will fire directly after power's does.
 2015-05-09 23:48:18 -07:00
Jordie0608
332419ca31 adds target to do_after 2015-05-10 15:44:54 +10:00
Jordie0608
502d21a4da Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine 
Conflicts:
	tgstation.dme
 2015-05-10 14:48:35 +10:00
spasticVerbalizer
087365e763 src.contents to src.loc.contents 2015-05-09 20:49:44 +02:00
phil235
72169da31f Merge pull request #9409 from GunHog/The_Machine_Spirit_Sings_To_Me 
Removes mining drill power mechanic.
 2015-05-09 19:38:17 +02:00
Cheridan
36be3b6983 Merge pull request #9110 from Xhuis/double_cannons 
Adds the Pneumatic Cannon
 2015-05-09 12:00:45 -05:00
spasticVerbalizer
faf6bff92c Typecheck for turf being a wall, look in contents rather than loc. 2015-05-09 18:58:30 +02:00
GunHog
7c9667db38 Merge remote-tracking branch 'remotes/upstream/master' into The_Machine_Spirit_Sings_To_Me 2015-05-09 11:40:44 -05:00
Cheridan
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
phil235
1875f3a9c2 Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere 
Group of fixes
 2015-05-09 16:23:46 +02:00
Jordie0608
7369992d3d further reorganization, elimination of old defines folder 2015-05-09 23:16:57 +10:00
Jordie
9387af3587 Merge pull request #9403 from francinum/patch-1 
Span Closure
 2015-05-09 22:12:04 +10:00
Jordie
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
Jordie
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
Jordie
54bcdb1b78 Merge pull request #9354 from Firecage/NoAIBuckling 
Prevents an AI from being buckled.
 2015-05-09 21:35:52 +10:00