cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-12 09:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,228 Commits 61 Branches 14 Tags
fb93f88fcae390d5cf27e2c4331a116a4e79c22a
Commit Graph

15359 Commits

Author SHA1 Message Date
KorPhaeron
44b276859e Merge pull request #17140 from ChangelingRain/shaketheroom 
Charger holoparasites now shake the target's camera
 2016-04-27 13:24:54 -05:00
Cheridan
eb7b0e528c Merge pull request #17097 from Shadowlight213/Jetpackimplant 
Fixes jetpack implant speed boost inconsistency.
 2016-04-27 13:13:28 -05:00
Cheridan
3a91fab55c Merge pull request #17163 from phil235/ImprinterFix 
Imprinter fix
 2016-04-27 12:41:16 -05:00
Joan Lung
ffc87184f0 You can now analyze blobs to check material effects, blob type, and health 
* You can now analyze blobs to check material effects, damage resistance, and health.

* beep beep

* slime extinguishes stuff

* I need to check my code

* wew

* buffnerfs

* fuckthemeta

* morebuffs

* no unfriendly fire

* damn my urge for low linecounts

* this makes me want to drink heavily

* if you see something, say nothing, and drink to forget

* waiting for an answer is for scrubs

* if you see something say nothing and drink to forget

* no resist printout

* phiiiiiiiil
 2016-04-27 10:24:47 -05:00
phil235
33d84ef73f Fixes inserting reagents in RnD machines 2016-04-27 13:05:13 +02:00
phil235
9657f328ec Fixes Reagent insertion in RnD machines 2016-04-27 13:04:05 +02:00
phil235
f4f09704eb fixes not being able to pour reagents in circuit imprinter/protolathe 2016-04-27 13:03:19 +02:00
Cheridan
e6509ddd23 Merge pull request #17115 from KorPhaeron/gun_fix 
[S] Fixes minigun bugs
 2016-04-27 02:52:22 -05:00
KorPhaeron
39c1af5792 Merge pull request #17147 from TechnoAlchemisto/skullhelm 
Adds craftable skull helmet.
 2016-04-26 23:56:34 -05:00
KorPhaeron
72c10bef00 Merge pull request #17132 from tgstation/duncathan-patch-1 
processor overload requires 20 players
 2016-04-26 23:22:59 -05:00
KorPhaeron
12d5a910b5 Merge pull request #17119 from TechnoAlchemisto/Mining_Harness 
Adds explorer belt to mining vendor.
 2016-04-26 20:06:48 -05:00
TechnoAlchemist
0a8da62457 adds primal category to stop clutter in cat_misc. 2016-04-26 16:34:54 -07:00
phil235
dc730e9b5b Fixes typo making the destructive analyzer always be busy. 2016-04-27 01:00:39 +02:00
TechnoAlchemist
5b19023f24 adds skull helmet. 2016-04-26 13:35:00 -07:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-26 21:49:51 +02:00
phil235
b7da04e8c8 You can now use your PDA on the emergency shuttle console. 2016-04-26 21:43:11 +02:00
KorPhaeron
2bc85f6e9e Merge pull request #17134 from Zuvassin/fortheskullthrone 
Adds champion armour to necro chests
 2016-04-26 12:51:05 -05:00
Nerd Lord
fe0f4e2ad0 Charger holoparasites now shake the target's camera 2016-04-26 11:22:22 -04:00
KorPhaeron
b8c6e93b29 Merge pull request #16732 from Iamgoofball/patch-22 
Fluorosulfuric SACid
 2016-04-26 05:13:09 -05:00
Zuvassin
dadae277cb Adds champion armour to necro chests 2016-04-26 18:55:31 +10:00
duncathan salt
62688574bc processor overload requires 20 players 2016-04-26 01:05:15 -06:00
KorPhaeron
08eca42e00 Merge pull request #17061 from TechnoAlchemisto/Bracers 
Adds craftable bracers, adds watchers dropping bones.
 2016-04-26 01:39:50 -05:00
KorPhaeron
c1987f699a Merge pull request #17093 from RandomMarine/cockroach 
Drones stop squishing cockroaches.
 2016-04-26 01:17:40 -05:00
Cheridan
07f17f8d61 Merge pull request #17111 from tgstation/ruinfix 
Should fix the maploader bugs
 2016-04-26 01:10:42 -05:00
TechnoAlchemist
930f49589d nerfs bracers :( 2016-04-25 21:01:31 -07:00
KorPhaeron
5b6d1386fd Merge pull request #17101 from TechnoAlchemisto/goliathplateREFACTOR 
Makes goliath plates stackable.
 2016-04-25 22:35:43 -05:00
TechnoAlchemist
98030c8480 """"""""Design Lead""""""""""" 2016-04-25 16:51:09 -07:00
TechnoAlchemist
04eac2cbe6 adds explorer belt. 2016-04-25 15:59:02 -07:00
Joan Lung
66a1520ad4 Merge pull request #17054 from coiax/processor-overload 
New Processor Overload event
 2016-04-25 18:40:22 -04:00
phil235
bb1f60e769 Fixes typos and errors I made. 
Fixes unscrewing a broken computer only dropping one glass shard instead of two.
Fixes AI holopad, recharger, keycard authentication device, reagent_dispensers reagentgrinder, and APC  not being attackable.
Fixes APC cover knockdown being random, it now uses the take_damage() proc, which also allows animals and xenos to knock down the cover of a broken apc.
 2016-04-25 22:29:17 +02:00
KorPhaeron
e8cc449e41 Fixes gun duping 2016-04-25 13:39:38 -05:00
KorPhaeron
f44688ed87 Minigun Fixes 2016-04-25 13:30:16 -05:00
duncathan salt
4686f80b39 fixes horrible runtimes 2016-04-25 10:20:27 -06:00
Joan Lung
ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today 
Refactors dog clothing
 2016-04-25 11:46:44 -04:00
duncathan salt
27bc533def fixes air bugs with the maploader changeturf, hopefully 2016-04-25 09:43:10 -06:00
duncathan salt
61ddd6797d Merge pull request #16969 from YotaXP/tgm-maploader 
[DNM] Updates the map loader to support TGM style map files
 2016-04-25 09:28:26 -06:00
Razharas
7e17d5a361 Merge pull request #17077 from KorPhaeron/gatling 
Undoes Gatling Nerf
 2016-04-25 17:08:11 +03:00
Jack Edge
8901ee0610 Actually compiles 2016-04-25 09:22:32 +01:00
Jack Edge
1a6ad107af Refactoring and tweaks 2016-04-25 09:01:52 +01:00
TechnoAlchemist
497e1ae3a9 fixes plate consumption in upgrades. 2016-04-24 23:50:01 -07:00
Jack Edge
bb4f035fd6 Merge branch 'master' into slaughter-fixes 2016-04-25 07:32:40 +01:00
TechnoAlchemist
d1359a3e09 What's it gonna be, loyalty to me? Or loyalty to your country? 
(export datum tweak)
 2016-04-24 23:24:42 -07:00
Jack Edge
508522c320 Minor explosion damage around exploded machine 2016-04-25 07:15:32 +01:00
KorPhaeron
efc2165f7e Merge pull request #17065 from Robustin/COMMONSENSE 
Shielded Hardsuits now have an internal jetpack
 2016-04-25 00:53:24 -05:00
KorPhaeron
df6c20d178 Merge pull request #17080 from Core0verload/gluvz 
Removes fake insulated gloves completely
 2016-04-25 00:46:18 -05:00
TechnoAlchemist
556f611278 makes the path /animalhide 2016-04-24 22:07:51 -07:00
TechnoAlchemist
581a13975b makes goliath plates stackable. 2016-04-24 21:27:48 -07:00
RandomMarine
f3f2962d26 buffs cockroach survivability 2016-04-24 18:26:23 -07:00
Shadowlight213
e32b9700a8 Fixes jetpack implant inconsistency 2016-04-24 18:01:43 -07:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-24 21:22:37 +02:00