cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 20:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,964 Commits 61 Branches 14 Tags
ccbbf623bb77796dc1d1774bedf6220abb6595bc
Commit Graph

10835 Commits

Author SHA1 Message Date
Remie Richards
38605d1aee Merge pull request #11712 from MrStonedOne/patch-37 
Ghost follow is now an orbit!
 2015-09-13 16:42:05 +01:00
Swag McYolosteinen
30b140ae8a Merge pull request #11603 from Fox-McCloud/stimulantsfix 
Fixes Stimulants Speedbuff
 2015-09-13 17:32:19 +02:00
Swag McYolosteinen
ed2858c2e2 Merge pull request #11737 from xxalpha/itsakindofmagic 
Fixed eye wear overriding see_invisible when it shouldn't.
 2015-09-13 17:27:19 +02:00
Swag McYolosteinen
ac41b600ce Merge pull request #11718 from phil235/TableClimbingFixes 
Tableclimbing & reagent runtime fixes
 2015-09-13 17:26:33 +02:00
Swag McYolosteinen
d57fac141a Merge pull request #11724 from RemieRichards/LargeInhands 
Inhands can now come in ANY SIZE, not just 32x32!
 2015-09-13 17:23:36 +02:00
Jordie
3e6f0c87bf Merge pull request #11731 from Fox-McCloud/Impropermaterials 
Fixes Consistency Issue with Materials
 2015-09-13 23:13:22 +10:00
Jordie
e718214a67 Merge pull request #11734 from Menshin/sheets_inserting_safety_checks 
Adds boundary checks for stack sheets inserting
 2015-09-13 23:13:04 +10:00
Fox-McCloud
9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Jordie
77911b67ba Merge pull request #11709 from bgobandit/fuckyouslimesfuckfuckfuck 
Fixes pink slime potions.
 2015-09-13 21:59:08 +10:00
Jordie
a4549ee9b3 Merge pull request #11727 from Aranclanos/goliathstentacles 
Fixes goliath tentacles not deleting themselves
 2015-09-13 21:56:22 +10:00
Jordie
15e50de0fe Merge pull request #11694 from bear1ake/point-zero 
Remove a bunch of useless .0 in vars
 2015-09-13 21:47:09 +10:00
Jordie
6c8bb6f518 Merge pull request #11632 from bgobandit/dirtymininglies 
Fixes asteroid turfs showing up as "mineral deposit."
 2015-09-13 21:45:56 +10:00
Jordie
5a34de7bd3 Merge pull request #11699 from Incoming5643/dirtyspaceman 
Fixes lizard looking odd with helmets
 2015-09-13 21:45:44 +10:00
Jordie
47fb102125 Merge pull request #11633 from bgobandit/cocosprite 
Coffee and tea mugs now appear empty when empty.
 2015-09-13 21:44:42 +10:00
Jordie
f02589180d Merge pull request #11698 from GunHog/MaybeNowSecWillWantThem 
Added a taser function back to the Advanced Energy Gun
 2015-09-13 21:42:45 +10:00
Menshin
89ce4e112d Stored the material name in case the stack was deleted after the sleep() when dealing with overlays. 2015-09-13 01:57:21 +02:00
xxalpha
701a5c7949 Fixed eye wear overriding see_invisible when it shouldn't. 
minmax
 2015-09-12 17:34:03 +01:00
bear1ake
c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero 
Conflicts:
	code/modules/research/protolathe.dm
 2015-09-12 21:07:40 +09:00
Menshin
ce2ee15b57 * Added boundary checks for stack sheets inserting (fixes #11732) 
* Limited material inserting to stack sheets for the protolathe and banana shoes
 2015-09-12 12:11:57 +02:00
Fox-McCloud
89fa65c127 Fixes Consistency Issue with Materials 2015-09-12 03:51:33 -04:00
Razharas
f9a01d1365 Merge pull request #11580 from xxalpha/protocontainer 
Changed protolathe code to use material container.
 2015-09-12 08:56:47 +03:00
Razharas
fbe1781374 Merge pull request #11609 from AnturK/outfits 
Outfit datum
 2015-09-12 08:56:12 +03:00
Razharas
4f9e6a33e0 Merge pull request #11678 from GunHog/ChemHeaterBoardFix 
Fixes missing chem heater board design
 2015-09-12 08:53:30 +03:00
Aranclanos
4b7cc90478 Fixes goliath tentacles not deleting themselves on a really particular situation, killing the mob with the tentacle hit. The mob must also delete itself on death. 2015-09-12 00:40:42 -03:00
Remie Richards
82e577be0b Items may now have inhands from 1x1 (why) to INFINITYxINFINITY (again, WHY), this allows for ridiculously large items! 
Adds a center_image() proc that centers an image larger or smaller than world.icon_size (32) so that it appears in the center of a human mob, like inhands.
 2015-09-12 00:45:14 +01:00
phil235
1db6687314 little tweak 2015-09-11 18:19:10 +02:00
phil235
c069ea0a7d Fixes runtime in monkey/attack_hand() 
Fixes tableclimbing: no more success message when failing; you can no longer pass through barricade when tableclimbing.
Fixes runtime with krokodil addiction
Xenomorph can no longer get addicted or overdose on reagents.
 2015-09-11 18:08:54 +02:00
xxalpha
28889d2b6a Changed protolathe code to use material container. 
Clean proc, typo fix

Standard sheet values
 2015-09-11 12:39:32 +01:00
Razharas
426a242f68 Merge pull request #11627 from Jordie0608/thebiblewastheoriginalredtape 
Resolves #5748, see jobban reasons from char setup
 2015-09-11 14:16:54 +03:00
Razharas
45fb337732 Merge pull request #11487 from bgobandit/matsblastusa 
Adds materials to some items for recycling purposes.
 2015-09-11 14:03:18 +03:00
Kyle Spier-Swenson
d3a61455a2 Ghost follow is now an orbit! 2015-09-10 23:13:28 -07:00
bgobandit
5ca28e3e5c Fixes pink slime potions. 2015-09-10 22:38:15 -04:00
phil235
e74ca82a47 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReagentReactionRuntimeFix 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
	icons/obj/assemblies/new_assemblies.dmi
 2015-09-10 21:49:39 +02:00
Razharas
17e5d0eea5 Merge pull request #11525 from xxalpha/dryshoes 
Absorbent galoshes.
 2015-09-10 22:01:03 +03:00
Incoming
2fab4fe3b6 Fixes a very specific appearance bug where lizard ears/horns wouldn't be properly updated by adding/removing helmets. 2015-09-10 14:23:11 -04:00
GunHog
34b5dbf5e7 Buffs AE Gun 
- Gives Advanced Energy Gun a taser mode.
- Allows them to accept Seclites.
 2015-09-10 11:27:30 -05:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Aranclanos
f587588eb9 Merge pull request #11636 from duncathan/lol 
distro fix + fixes runtimes
 2015-09-09 20:37:51 -03:00
bgobandit
b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa 
Conflicts:
	code/modules/assembly/flash.dm
 2015-09-09 14:04:41 -04:00
GunHog
1d9b59e28b Fixes missing chem heater board design 
- Fixes #11673 (deleted a tab)
 2015-09-09 12:53:00 -05:00
Aranclanos
fbbdbe17ed Merge pull request #11666 from tgstation/Fixing_bugs_from_browser_with_edit_button 
Fixes blood mixing not merging symptoms properly
 2015-09-09 12:48:52 -03:00
Cheridan
304d91fa2c Merge pull request #11606 from Firecage/gunnames 
This gives most projectile guns less generic names.
 2015-09-09 10:45:18 -05:00
Firecage
2a90cd109e Stetchkin pistol rename. 2015-09-09 17:36:14 +02:00
Razharas
c40dea1ebd Removes src and renames the argument 
Removes src and renames the argument
 2015-09-09 16:36:40 +03:00
duncathan
b86464f573 woo more runtimes 2015-09-08 22:59:18 -06:00
Cheridan
44033427a9 Merge pull request #11630 from bgobandit/slimepotionfixfuck 
Fixes/tweaks slime potions.
 2015-09-08 20:11:31 -05:00
Cheridan
dbcc6aeed8 Merge pull request #11650 from optimumtact/patch-9 
Better error messages for start game verb
 2015-09-08 20:06:14 -05:00
Razharas
524186e4db Merge pull request #11569 from Anonus/blobchemtweaks 
Changes blob chemicals
 2015-09-09 02:44:34 +03:00
Razharas
161156cffc Merge pull request #11585 from bgobandit/legitposters 
Poster changes!
 2015-09-09 02:38:56 +03:00
Razharas
54a58ddbf5 Fixes blood mixing not merging symptoms properly 
Fixes blood mixing not merging symptoms properly
Fix  #11482
 2015-09-09 01:46:04 +03:00