cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,192 Commits 61 Branches 14 Tags
dc2bf262e628aa2b040071b87f0dbeb40d833804
Commit Graph

2804 Commits

Author SHA1 Message Date
Razharas
2271499db7 Merge pull request #8058 from Iamgoofball/explosive 
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
 2015-03-21 09:54:11 +03:00
Jordie
5d1155e09e Merge pull request #8435 from Zelacks/ChemImplantGuiFix 
Chemical implant action button fix
 2015-03-21 17:25:08 +11:00
Remie Richards
819422bc3e Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay 
MIAUW VON SAYCODE 3: RISE OF THE SPANS
 2015-03-21 05:05:37 +00:00
Swag McYolosteinen
9e25fe4019 Merge pull request #8431 from AnturK/lawsupdated 
Adds total law changes counter
 2015-03-20 17:46:44 +01:00
Swag McYolosteinen
57aadcc7fb Merge pull request #8424 from phil235/SiliconWeldProtFix 
Fixes silicons being flashed when welding.
 2015-03-20 17:46:16 +01:00
Zelacks
8e2850f832 The action button should be correctly handled in chem implants by injecting all the reagents if the action buttion is the cause 2015-03-20 03:58:58 +08:00
AnturK
7cccf20fc0 Adds total law changes counter 2015-03-19 14:57:12 +01:00
Iamgoofball
b7adce753a Fixes unreported bug with clf3, changes the brainloss in heart attack to do 1 brute instead of 10 brain, makes health scanners show heart attacks. 2015-03-18 20:33:03 -07:00
phil235
c9312a6ab7 Fixes silicons being flashed when welding. Silicons and repair drones now have eye protection like aliens. This means flashers and flashbangs no longer flash them, but flashbang still weaken them, and lasers and handheld flashes still work on them. 2015-03-19 04:04:44 +01:00
Miauw
1873143e63 Initial say cleanup commit. 2015-03-18 19:23:31 +01:00
Jordie
cb9d49ab02 Merge pull request #8359 from xxalpha/stackfix 
Fixes several zero amount stack bugs.
 2015-03-17 17:10:04 +11:00
Jordie
0850fc626e Merge pull request #8358 from CandyClownTG/patch-1 
Update fancy.dm
 2015-03-17 17:09:37 +11:00
Iamgoofball
7600697c13 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-03-16 21:13:56 -07:00
Jordie
9c148ff13e Merge pull request #8315 from phil235/BigUserdanger 
Makes the message when you're attacked slightly bigger
 2015-03-16 18:30:21 +11:00
phil235
d7f29d770c Merge pull request #8113 from Xhuis/boom_boom_shake_the_room 
Restores gibbing for suicide C4
 2015-03-15 22:50:12 +01:00
xxalpha
c9d600e653 Fixes stack duping. 2015-03-15 19:04:07 +00:00
phil235
78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger 
Conflicts:
	code/modules/events/ninja.dm
 2015-03-15 12:30:27 +01:00
Cheridan
da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through 
Code cleanup
 2015-03-15 01:55:39 -05:00
Iamgoofball
d0f101cd37 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
 2015-03-14 21:32:13 -07:00
Iamgoofball
33ffd33180 fixes and tweaks 2015-03-14 21:13:23 -07:00
Cheridan
0b7be73f62 Merge pull request #8286 from phil235/SteelcapFix 
Steel cap, sandstone and welding fixes plus flashing refactor
 2015-03-14 22:56:37 -05:00
Iamgoofball
7114d5ac04 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-Medicine.dm
 2015-03-14 20:00:35 -07:00
CandyClownTG
87f0f44112 Update fancy.dm 
Replaced Doctor's Delight with Omnizine to make Syndicate Smokes useful again.
 2015-03-14 21:20:33 -04:00
Cheridan
0cdffeecfb Merge pull request #8296 from phil235/TablecraftFix 
Tablecraft Fix and recipe detection
 2015-03-14 19:41:56 -05:00
phil235
0232afd05d Fix typo in catalyst. 
Fix flamethrower crafting recipe (now only use 1 rod, calls checkparts() to set up the weldingtool and igniter).
Fix lack of message when trying to turn on an unsecured welding tool.
Fix lack of icon update when clicking plasma tank with empty flamethrower.
 2015-03-15 00:23:47 +01:00
Cheridan
52dfa42eb5 Merge pull request #8257 from phil235/ReflectFix 
Simplifies laser reflection code
 2015-03-14 16:15:52 -05:00
Cheridan
ecb3a4e08f Merge pull request #8236 from phil235/DoughChange 
Dough change
 2015-03-13 15:34:39 -05:00
Cheridan
3b89c07cd3 Merge pull request #8259 from phil235/BibleBookBagBug 
Fixes book bags not being able to hold bibles and looking like backpacks
 2015-03-13 12:51:10 -05:00
MrPerson
9038fb15af Code cleanup 
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
 2015-03-13 10:41:00 -07:00
Cheridan
28f6aae00c Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup 
Conflicts:
	icons/mob/back.dmi

remie is a nerd btw
 2015-03-12 20:47:11 -05:00
phil235
29609457f5 Makes the message when you're attacked slightly bigger for better visibility." 
Changes two "for... show_message()" into "visible_message()".
 2015-03-12 23:15:54 +01:00
phil235
16a0d7bf80 Fix for flamethrower deconstruction. 2015-03-12 19:58:37 +01:00
phil235
1eba7b694b Merge pull request #8134 from Miauw62/ghostradios 
Adds a toggle so ghosts can hear radio chatter more easily.
 2015-03-10 23:56:28 +01:00
phil235
7ba8af5222 Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods. 
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
 2015-03-10 20:30:46 +01:00
Remie Richards
751fb4aaa9 Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks. 2015-03-09 21:48:45 +00:00
Xhuis
5e1c69a76a Removes unnecessary stuff 2015-03-09 16:48:41 -04:00
Xhuis
00e352cee2 Restores gibbing for suiciding with C4 2015-03-09 16:47:16 -04:00
phil235
4f6c96235b Fixes book bags not being able to hold bibles. 
Changes the book bag sprite so it looks more like a briefcase and isn't confused with a backpack.
 2015-03-09 21:13:01 +01:00
phil235
82b1b1adcd Merge branch 'master' of https://github.com/tgstation/-tg-station into DoughChange 
Conflicts:
	icons/obj/food.dmi
 2015-03-09 19:48:23 +01:00
phil235
4071f25270 Simplifies laser reflection code, no more reflect_chance var at the obj/item level. 2015-03-09 12:28:35 +01:00
Cheridan
fbab136950 Merge pull request #8016 from RemieRichards/EmbeddingBalance 
Embedded Item Balancing. Also fixes #8029
 2015-03-09 02:03:18 -05:00
Iamgoofball
e6f257d413 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
 2015-03-08 14:26:52 -07:00
phil235
1a092e0ede Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively for vegans 15 soymilk instead of the eggyolk). 
Introduce egg yolk reagent
You can break eggs in open reagent containers or blend them to get egg yolk.
Fixes breadslices sprites and other merge conflict bugs in food.dmi.
Change customizable snack max volume to 60. Buff nutriment amount in doughs.
 2015-03-08 22:15:55 +01:00
phil235
77d553e619 Fixes disposal climbing. 
Aliens, slimes and monkeys can climb into disposal but cannot flush it.
Non carbon mobs can no longer climb into disposal by themselves.
Stuffing another mob in a disposal unit is now only done via grabbing.(fixes bugs like stuffing someone while being inside the disposal yourself)
Large mobs no longer fit inside disposal.
Fixes hydrotray growing overlay layer.
Fixes slicing broken pipes dropping a straight pipe.
Fixes typos.
Removing unused var from disposal.
 2015-03-07 19:35:44 +01:00
Cheridan
95e269e211 Merge pull request #8122 from Xhuis/miners_messiah 
Adds the ore satchel of holding
 2015-03-06 15:15:40 -06:00
Cheridan
377dd9f876 Merge pull request #8142 from phil235/girderfixes 
Fixes many checks in construction from stacks,
 2015-03-06 13:54:09 -06:00
Cheridan
d56cb89407 Merge pull request #8076 from xxalpha/lighters 
Grayscale Lighters
 2015-03-06 00:00:51 -06:00
Cheridan
9cf4a0bfc6 Merge pull request #8114 from phil235/CookTrash 
Cooking fixes for meat and trash
 2015-03-05 23:54:29 -06:00
Cheridan
07676b352d Merge pull request #8128 from Ikarrus/gangfixup 
Makes Gang mode functional again
 2015-03-05 21:11:59 -06:00
Swag McYolosteinen
daa6fa89d0 Merge pull request #8014 from paprka/altclick2 
Alt click for PDAs
 2015-03-05 19:13:07 +01:00