cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-20 14:04:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,741 Commits 61 Branches 14 Tags
a795589bfbbac3b70083ef22b5abe4f2d7c2fe85
Commit Graph

4666 Commits

Author SHA1 Message Date
Rockdtben
a795589bfb Revert monkey/life.dm 2014-03-13 18:48:23 -05:00
Rockdtben
c9d12f4e39 Revert human/life.dm 2014-03-13 18:47:03 -05:00
Rockdtben
a034e41f25 Removing TLE comment stamps and useless comments 2014-03-13 08:25:28 -05:00
fleure
7d0ddb0e72 Merge pull request #2987 from Ccomp5950/apc_bugfix 
APC overlay bugfix.
 2014-03-12 10:46:19 +00:00
Cheridan
f7337f1aa9 Merge pull request #3014 from fleure/tanks 
Added atmos and jani watertanks, changed nozzle types [MAP]
 2014-03-11 21:24:27 -05:00
Aranclanos
b1a489ac07 Merge pull request #3000 from Cheridan/3000 
adds the mime mech
 2014-03-10 23:21:34 -02:00
fleure
e2d839fecd Merge pull request #3013 from Miauw62/suitslowdown 
Adjusts space suit slowdown to fit recent runspeed nerfs.
 2014-03-11 00:24:43 +00:00
Aranclanos
638ca8e22e Made the singularity name lowercase 2014-03-10 19:45:39 -03:00
Aranclanos
f32dc05bf7 Merge branch 'THESINGULOATEMYBOH!' of https://github.com/Miauw62/-tg-station into THESINGULOATEMYBOH! 2014-03-10 19:45:01 -03:00
fleure
b6e7155a24 Changed janitor and atmos tanks slightly 2014-03-10 20:27:21 +00:00
Cheridan
f8facf7f43 Merge pull request #3021 from Giacom/viro_genetics 
Added two new symptoms to virology.
 2014-03-10 13:31:04 -05:00
Cheridan
a7b7bd0bf2 Merge pull request #3023 from Jordie0608/allthebuttons 
Reload admins usable by anyone with adminrank
 2014-03-09 14:10:17 -05:00
Rockdtben
bf995b001b Merge pull request #3019 from drynwyn/master 
Switch tournament gangster ammo to match weapon
 2014-03-08 08:36:53 -06:00
Jordie0608
1fc448c043 Reload admins usable by anyone with adminrank 2014-03-08 15:46:36 +11:00
Robson Richards
49e0cbd125 Reworked arguments to suit new GetTypeInAllContents 2014-03-07 21:06:46 +00:00
Robson Richards
0b07ae9f72 Merge branch 'master' of https://github.com/tgstation/-tg-station into 23/02/2014-Fuck-Nuke-Disk 2014-03-07 20:55:34 +00:00
Giacomand
a92482ee4a Added two new symptoms to virology. They will mutate the victim and randomly set a power/disability block, after cleaning it to remove remaining powers/disabilities. One symptom only sets powers and the other only sets disabilities. 
Changed the virus mix reaction to only require one plasma or mutagen, to remove the annoyance that virology has with the randomness aspect of it.

Refactor'd dna code to be a little tidier.
 2014-03-07 17:49:01 +00:00
drynwyn
abefc24a87 Switch gangster ammo to match weapon 
Fixes #2988
 2014-03-07 09:54:59 -05:00
Ergovisavi
062f368ce0 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 2014-03-07 04:24:51 -08:00
Ergovisavi
6cfe2398d9 Changed around the way things are attacked by objects and got rid of the tapping message as it can screw with afterattack stuff. 2014-03-07 03:19:12 -08:00
fleure
026c991b95 Added atmos and jani watertanks, changed nozzle types 2014-03-07 01:13:19 +00:00
Miauw
b7794bcdde Adjusts space suit slowdown to fit recent runspeed nerfs. 2014-03-06 21:00:07 +01:00
Ergovisavi
a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 
Item attack changes
 2014-03-06 03:17:02 -08:00
Cheridan
7ea56ca131 adds the mime mech 2014-03-05 18:06:56 -06:00
Ccomp5950
d8df1df6b5 APC overlay bugfix. 
Before: If you turned off the breaker and fiddled with on/off states and turned on the breaker it wouldn't update the overlay because the check_updates wasn't doing an if(operating) check and would think it didn't need to update the overlays once you turned on the breaker.

After: Check_update() now takes into account the operating (breaker on/off) variable and accounts for it in update_overlay.

Thanks Razharas from /tg/ #coderbus for bringing this to my attention.
 2014-03-04 20:50:34 -06:00
Razharas
c548df264b Conflict fix 2014-03-05 06:30:29 +04:00
Cheridan
1cf3af0d72 Merge pull request #2973 from Kelenius/master 
Seed extractor as storage
 2014-03-04 17:04:22 -06:00
Cheridan
ab7a9c6266 Merge pull request #2965 from RandomMarine/plusonehat 
Makes wizard hat defenses match the robe.
 2014-03-04 03:05:07 -06:00
Cheridan
8307933d30 Merge pull request #2916 from Incoming5643/ventcrawlinginmyskin 
Improved/Expanded Ventcrawling
 2014-03-04 02:50:38 -06:00
MrSnapwalk
00fd755b8c Automerge Fix 2: Electric Boogaloo 
This is why we can't have nice things.
 2014-03-03 20:12:30 -06:00
Razharas
5e61e9ea76 Merge pull request #2960 from hornygranny/balancepass 
combat rebalance tweaks
 2014-03-03 17:59:39 -08:00
Cheridan
d4c81ce247 Merge pull request #2936 from MrPerson/jitterbug_dizzydummies 
Redo of jitteriness and dizziness.
 2014-03-03 11:35:27 -06:00
Kelenius
4675af9f19 Seed extractor upgrade 2014-03-03 15:38:16 +04:00
Razharas
f3ccaa5936 Merge conflicts fix 2014-03-03 05:42:31 +04:00
Razharas
3901aa51a0 Hydro fix 2014-03-03 05:33:37 +04:00
Ergovisavi
3a96098d55 Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes 
Also fixed some weird autodrobe runtime on startup
 2014-03-02 17:07:24 -08:00
MrSnapwalk
789134d8f2 Automerge fix 
Fixing the conflicts preventing an automerge.
 2014-03-02 17:03:35 -06:00
Razharas
240ad7031c Merge pull request #2891 from RobRichards1997/23/02/2014-BurnBabyBurnFueltankInferno 
Gives fuel tanks a fire_act()
 2014-03-02 14:19:44 -08:00
MrSnapwalk
b03fc3d645 More suits, and more fixes. 
More suits by Nienhaus, and a few fixes for the contents of lockers.
Also added a dermal armor patch to the Captain's locker, for added head
protection without the downside of helmet-hair.
 2014-03-02 16:10:08 -06:00
Razharas
0b837da831 Merge pull request #2942 from GinjaNinja32/chemistry-fix 
Make constructible dispenser use same order as standard
 2014-03-02 13:48:55 -08:00
Razharas
2adf8cc643 Merge pull request #2932 from Miauw62/honkhonkhonkhonk 
Mutagen is less fuck you deadly.
 2014-03-02 13:43:31 -08:00
Razharas
d2abd92f23 Merge pull request #2927 from AlexanderUlanH/alium 
Buffed Lamarr at laser tag
 2014-03-02 13:41:37 -08:00
Razharas
f259e815d4 Merge pull request #2924 from TZK13/Shotgun-Shells 
Incendiary shotgun shells
 2014-03-02 13:39:50 -08:00
Razharas
2aa4f2728f Merge pull request #2912 from Miauw62/ihavenoideawhati'mdoing 
Fixes some misc NODROP stuff I think
 2014-03-02 13:30:23 -08:00
Razharas
b70c33d42a Merge pull request #2905 from Incoming5643/GolemBreathing 
Fixes Golems not being able to use internals with their own face
 2014-03-02 13:27:38 -08:00
Razharas
263e2abec6 Merge pull request #2885 from AlexanderUlanH/idedplsnerf 
Rebalanced EMP's against mobs
 2014-03-02 13:26:38 -08:00
fleure
467e65279b Merge pull request #2904 from Rumia29/22/02/2014_sombrero 
Sombrero(s) + Ponchos
 2014-03-02 19:41:37 +00:00
Aranclanos
e6d654853b Merge pull request #2945 from YotaXP/kill-group_multiplier 
Removed old FEA files, and a more-than-useless variable.
 2014-03-02 14:59:56 -02:00
RandomMarine
1be87663f5 Formatting. 2014-03-02 05:57:50 -08:00
RandomMarine
f71e4dc23a Okay I think this is good now. 2014-03-02 05:43:25 -08:00