cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-04 13:29:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,228 Commits 63 Branches 14 Tags
6fef7fefeac829ba26df2a856f7f46e8570d91dd
Commit Graph

4711 Commits

Author SHA1 Message Date
Jordie
59af7cfd42 Merge pull request #8323 from Mandurrrh/miningborgupgrade 
Adds a cyborg upgrade module for the satchel of holding.
 2015-03-24 16:40:52 +11:00
hornygranny
b73dd39854 Merge pull request #8436 from phil235/VendMachineCoinItemsFix 
Fixes vending machines starting with no coin or hacked items.
 2015-03-23 16:33:26 -07:00
hornygranny
506da51f96 Merge pull request #8455 from Incoming5643/how_bout_I_get_you_some_stones 
Adds click delay to smacking up statues
 2015-03-23 16:31:53 -07:00
Cheridan
beacf0cf4a Merge pull request #8349 from MrPerson/qdel_reagents_hopefully 
Fix reagent garbage collection hopefully
 2015-03-23 08:55:11 -05:00
Swag McYolosteinen
53e40ec315 Merge pull request #8427 from Cheridan/day3_collars 
Event Day 3 - Pet Collars!
 2015-03-22 19:37:12 +01:00
Nienhaus
9486248553 Merge pull request #8440 from dannno/coperite 
GAR GLASSES
 2015-03-22 12:05:21 -05:00
MrPerson
9229f72573 Fix up certain chemicals to not overwrite Del(). Meh. 
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
 2015-03-21 23:04:53 -07:00
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
Jordie
d361649df5 Merge pull request #8369 from pudl/retardfix 
normal sec headset
 2015-03-21 17:23:18 +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
Incoming
5861b643b6 Adds click delay to smacking up statues. Fixes #8313 2015-03-20 23:50:25 -04:00
xxalpha
c25576ad6a Merge remote-tracking branch 'upstream/master' into catwalkmachines 
Conflicts:
	code/game/objects/structures/lattice.dm
 2015-03-20 17:02:00 +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
Swag McYolosteinen
7d17c54555 Merge pull request #8411 from xxalpha/cablefix 
Fixes cables being destroyed when creating plating out of catwalk space.
 2015-03-20 17:45:36 +01:00
Swag McYolosteinen
d95209a5df Merge pull request #8391 from Incoming5643/Statue_of_limitations 
Fixes invincible unstoppable death statues
 2015-03-20 17:43:22 +01:00
dannno
29477dfccc adds GAR glasses of various flavors 
you're welcome
 2015-03-20 01:29:54 -04:00
phil235
17fe2ae3f2 Fixes vending machines starting with no coin or hacked items. Now those items also use the resupply canister charges, but they are the last ones to be resupplied. 
Fixes the amount of charges per resupply canister so all vending machines starts fully loaded.
 2015-03-20 00:28:44 +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
Jordie
9551919970 Merge pull request #8395 from xxalpha/jetpacktrail 
Fixes the jetpack trail animation.
 2015-03-19 16:44:37 +11:00
Jordie
e5fdddc7d8 Merge pull request #8289 from Xhuis/alt_clicking 
Allows alt-clicking for some stuff
 2015-03-19 16:43:53 +11:00
Cheridan
a66018cb4b Adds collar to HoP closet 2015-03-19 00:18:56 -05: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
Cheridan
7149f0382d Adds Pet Collars! 
Map needs update now
 2015-03-18 21:27:21 -05:00
xxalpha
790bdd90b0 Fixes cables being destroyed when creating plating out of catwalk space. 2015-03-18 19:17:04 +00:00
Miauw
1873143e63 Initial say cleanup commit. 2015-03-18 19:23:31 +01:00
xxalpha
50e4b1a024 Fixes jetpack trail animation. 
Fixes jetpack trail animation 2.
 2015-03-17 21:22:47 +00:00
Incoming
612ededfd0 Removes factions from sentient mobs, as they both don't need them being player contr and it leads to some really exotic bugs. 
Fixes an unreported bug where statues could bleed out
 2015-03-17 14:26:05 -04: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
pudl
485231c7f8 security officers once again have the choice of a normal headset 2015-03-15 23:32:54 -05: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
cb07696814 Merge pull request #8319 from MMMiracles/bearpelts4everyone 
Ability to put bears on meat spikes.
 2015-03-15 02:34:07 -05:00
Cheridan
da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through 
Code cleanup
 2015-03-15 01:55:39 -05:00
Iamgoofball
4def104810 Makes smoke effect all /mob/living. 2015-03-14 22:26:14 -07: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
MrPerson
7c305305b7 Fix reagent garbage collection hopefully 
I say hopefully because stuff that collects successfully locally likes to fail on sybil.
 2015-03-14 16:52:49 -07: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