cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,643 Commits 61 Branches 14 Tags
ad8750eeb718cd00d453c8eefd4bcd0f866c29ff
Commit Graph

5127 Commits

Author SHA1 Message Date
Cheridan
ad8750eeb7 Merge pull request #9615 from phil235/RuntimesFixes 
Runtime fixes and stuff.
 2015-05-24 19:40:53 -05: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
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
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
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
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