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

347 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
xxalpha
50e4b1a024 Fixes jetpack trail animation. 
Fixes jetpack trail animation 2.
 2015-03-17 21:22:47 +00:00
Iamgoofball
4def104810 Makes smoke effect all /mob/living. 2015-03-14 22:26:14 -07:00
Iamgoofball
e5a3694c0f Adds Napalm as a reagent and merges old napalm into Phlog. Fixes some foam stuff. 2015-03-08 19:43:17 -07:00
Iamgoofball
8dfcbd8b24 Changes smoke back to TOUCH reaction. 2015-03-08 17:04:45 -07:00
Iamgoofball
573aea927b Removes newcrit, fixes, changes, old chems now process every tick as per usual, only goonchems process every 3 ticks now. 2015-03-08 16:43:57 -07: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
Mandurrrh
48daa155d7 Fixes #8116 trails bug 2015-03-04 19:53:11 -05:00
Iamgoofball
3964cb3126 Adds heart attacks properly. 2015-03-02 20:50:48 -08:00
Ikarrus
c62d387a1d Randomizes Order of Job Spawn Points 
The ticker's setup() will shuffle the list of spawn points, so jobs won't always predictably spawn bottom-up and left-to-right
 2015-03-02 20:01:36 -07:00
Iamgoofball
3b2963dcab More changes, more bugs 2015-02-28 10:19:52 -08:00
dannno
9b1fa2479b conflict fixing + changelog 2015-02-26 16:48:11 -05:00
dannno
23ecfeebf8 THE OWL RETURNS: PART 4: PRODUCT PLACEMENT 
- adds The Owl and The Griffin prize toys to the arcade
- adds The Owl and The Griffin posters (legit and contraband respectively)
- adds The Nest barsign
 2015-02-26 16:36:44 -05:00
Razharas
588c79873f Merge pull request #7562 from Iamgoofball/drugs 
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
 2015-02-25 08:26:21 +03:00
Remie Richards
b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams 
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
 2015-02-24 22:16:53 +00:00
dannno
44ea489940 THE OWL RETURNS: PART 2: REVENGE OF THE GRIFFIN 
- adds The Griffin costume to the autodrobe
 2015-02-23 17:30:17 -05:00
dannno
e8fb3d1f05 THE OWL RETURNS: PART 1: THE PLASMA RISES 
- all owl items resprited
- owl wings added; suit slot item, wings are toggleable
 2015-02-23 16:49:17 -05:00
Iamgoofball
e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 
Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi
 2015-02-20 22:00:53 -08:00
Cheridan
fe3764dae8 Merge pull request #7765 from Thunder12345/glovening 
[REFACTOR] Reworks maintenance fake insulated gloves
 2015-02-20 14:24:54 -06:00
Cheridan
e861281a03 Merge pull request #7783 from Delimusca/minesofshame 
cleans up mines
 2015-02-20 12:16:14 -06:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
hornygranny
da4f8e74d8 Merge pull request #7733 from Cheridan/reagent_foam 
Reagent Foam
 2015-02-18 21:43:50 -08:00
Delimusca
792becf2b3 fixes kickmine runtime 2015-02-17 09:56:16 -07:00
Delimusca
bca0a7b320 readds kick mine 2015-02-17 09:28:24 -07:00
Delimusca
f12d3d9fbf cleans up mines 2015-02-17 00:08:28 -07:00
Thunder12345
702419f265 Merge remote-tracking branch 'upstream/master' into glovening 2015-02-16 12:24:06 +00:00
Thunder12345
9f471cb7e4 Reworks fake yellows 
Replaces the varedited white gloves in the maint loot spawner list with
a subtype of insulated gloves, with the siemens coefficient changed to 1
and a different desc.
 2015-02-16 12:20:06 +00:00
Cheridan
85ec168881 Foam spreading now respects type. 2015-02-14 13:32:32 -06:00
Cheridan
69b856f373 Saving before I ruin everything 
Lightning works too
Cleans up old shit from Chemistry-Recipes.dm
 2015-02-14 11:46:20 -06:00
Cheridan
e5cecc41a6 Merge branch 'master' of https://github.com/tgstation/-tg-station into reagent_foam 2015-02-14 10:50:53 -06:00
phil235
135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration. 
Fixes Alien embryo processing that was processed twice.
 2015-02-14 14:18:49 +01:00
Iamgoofball
f6d7823fc2 Adds muriatic, caustic, and hydrochloride to maint loot 2015-02-05 18:57:58 -08:00
Cheridan
80913f143b Merge pull request #7239 from paprka/ointmentandshit 
BLOOD FOR THE BLOOD GOD
 2015-02-03 16:30:42 -06:00
xxalpha
a9c181bbcc Repath all non jetpack tank types to tank/internals 
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
 2015-02-01 18:25:39 +00:00
paprka
d6dce069f4 finally actually fixes the blood decals 2015-02-01 00:29:37 -08:00
paprka
0b64a23310 fixes blood drips 2015-01-31 23:40:27 -08:00
paprka
a661e58281 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-31 22:03:00 -08:00
Cheridan
284223102e Reagent foam works 
TODO: Make metal foam work
 2015-01-26 00:17:15 -06:00
paprka
c43092efa9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 2015-01-25 21:56:39 -08:00
Cheridan
aa3b7d9a75 Splits effect_system.dm into individual files. 2015-01-25 13:57:45 -06:00
paprka
f071655ea4 updates and optimizations 2015-01-24 01:12:57 -08:00
Sawu
21edbc1f6f Changes/Fixes/Features to the Experimentor 
* Fixes #7224
* Re-fixes #7272
* Adds relics that spawn around the station, can be researched for randomised objects.
* Adds the meteor malfunction.
 2015-01-22 14:01:02 +11:00
paprka
1cdd5f011f blood for the blood god 2015-01-20 19:17:59 -08:00
Steelpoint
64ba51c0b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2 2015-01-13 12:52:24 +08:00
Steelpoint
982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
tkdrg
b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
Razharas
f48563f1d1 Fixes some bugs and rutimes tkdrg pointed 
Monkeys arent blind anymore
Bad dna mutation runtime fixed
Two handed shit runtime fixed
Carbons unarmed attacks runtime fixed
 2015-01-08 22:35:07 +03:00
Steelpoint
ec821c33d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	_maps/map_files/generic/z2.dmm
	code/_globalvars/lists/mapping.dm
 2015-01-06 12:17:29 +08:00
Steelpoint
49ea9b0543 EmergencyResponseTeam-AntagSelectionForAdmins 2015-01-05 20:20:11 +08:00
carnie
a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2015-01-04 01:52:14 +00:00