cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-08 23:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,652 Commits 63 Branches 14 Tags
e9965254b42e53aaba30cd1b7a3532d8919ace67
Commit Graph

26825 Commits

Author SHA1 Message Date
KorPhaeron
e9965254b4 Fixes for the ship in a bottle 2016-05-05 05:30:54 -05:00
KorPhaeron
343b32837e Ship in a bottle 2016-05-04 02:59:17 -05:00
Cheridan
e7ee10b517 Merge pull request #17060 from KorPhaeron/belt 
Military Belt is not a backpack
 2016-05-03 13:10:23 -05:00
Aloraydrel
89ab88a7e1 Lab coats can carry emergency oxygen tanks (#17307) 
* Adds emergency tanks to labcoat.dm


* I have little idea what im doing but this should work

* Ok this is it

* Ree
 2016-05-03 12:55:48 +02:00
KorPhaeron
d191efc751 Merge pull request #17329 from Cheridan/scavengers 
Ashwalker Den Update
 2016-05-03 03:01:50 -05:00
Cheridan
e64783c1fa Merge pull request #17282 from coiax/brobot-is-an-artist 
Service and standard cyborgs get a spraycan; service cyborgs get a cyborg-hand labeler
 2016-05-03 01:55:01 -05:00
KorPhaeron
423ee67c73 Merge pull request #17330 from coiax/lavaproof-staff 
Staff of lava is now lavaproof
 2016-05-03 01:03:46 -05:00
Joan Lung
fe060eb1fa Merge pull request #17306 from coiax/fleshmend-diminishing-returns 
Fleshmend: Diminishing returns; Panacea: Better.
 2016-05-02 18:52:17 -04:00
Jack Edge
9f7e6f04ed Code review 2016-05-02 23:30:08 +01:00
Jack Edge
340dd8b1a3 Reduced mannitol to sane amounts 2016-05-02 22:27:43 +01:00
Jack Edge
4ee3d491e7 Corrected incorrect description of booze 2016-05-02 22:23:36 +01:00
Jack Edge
7c293f0aa6 Spray cans contain flammable solvents 
Also, spraying someone will stun them even if they lack a client.
 2016-05-02 22:19:49 +01:00
Cheridan
d67922d626 Walker tendrils strip mobs before gibbing now 2016-05-02 14:38:41 -05:00
AnturK
340b1d01ff Merge pull request #17314 from RemieRichards/mecha_pilot_fix 
Mecha and Mecha pilot fixes
 2016-05-02 20:25:44 +02:00
Joan Lung
faad4d5b71 Merge pull request #17293 from RemieRichards/clothing_variable_modding 
Allows clothing to alter variables on the wearer, Admin modifiable too!
 2016-05-02 12:21:23 -04:00
Remie Richards
bc754a7bfc Fixes Haunted Mecha, Fixes Mecha damage runtimes, Fixes Mecha bumpsmash working without a pilot. 2016-05-02 17:18:34 +01:00
AnturK
878d76a4b7 Merge pull request #17062 from Core0verload/bloodbrood 
New function for hivelord core / legion heart
 2016-05-02 11:39:18 +02:00
KorPhaeron
31cc0d1dc8 Merge pull request #17264 from PKPenguin321/patch-2 
makes screwing windows 1 second faster
 2016-05-02 03:51:52 -05:00
Jack Edge
292901357e Staff of lava is now lavaproof 
Staff of lava is now lavaproof.
 2016-05-02 09:07:47 +01:00
Cheridan
6db3624cf8 Ashwalker Scavengers 2016-05-02 02:45:39 -05:00
Cheridan
581a755ae5 Merge pull request #17269 from Core0verload/supplytimer 
Drops supply shuttle delay to 1 minute
 2016-05-02 00:01:46 -05:00
Cheridan
46c0b3c6db Merge pull request #17281 from bgobandit/memerystocks 
Changes the stock market permanently and drastically
 2016-05-01 23:53:52 -05:00
Cheridan
d54a07b537 Merge pull request #17279 from RandomMarine/crithud 
Buffs medical hud.
 2016-05-01 23:51:45 -05:00
Cheridan
ce163d902c Merge pull request #17286 from bgobandit/domfix 
Broken dominators will no longer beep once a new dominator is activated.
 2016-05-01 23:48:10 -05:00
Cheridan
08579759fb Merge pull request #17296 from ChangelingRain/justwatch 
Watchers now instantly fire at targets instead of setting temperature
 2016-05-01 23:30:25 -05:00
Cheridan
23cb217905 Merge pull request #17299 from RandomMarine/mobile 
Changes locker description
 2016-05-01 22:26:15 -05:00
Cheridan
009988b553 Merge pull request #17292 from erwgd/PlasmamanStartInternalsOn 
When joining game as plasmaman, start with internals on
 2016-05-01 21:58:30 -05:00
Joan Lung
3eeb0cb8e9 Robust Cult changes 
* Robust Cult changes

* just cache the turf ffs

* if you see something say nothing and drink to forget

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

* messagefix

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

* if you see something say nothing and drink to forget

* if you see something say nothing and drink to forget

* if you see something say nothing, and drink to forget
 2016-05-01 21:37:02 -05:00
TechnoAlchemist
74bb2b28ab makes sure people have the right types of armor 2016-05-01 18:59:51 -07:00
TechnoAlchemist
b3286b9d39 Fixes alt sprites not working. Changes sprites of HOP armor and BARKEEP armor. 2016-05-01 18:52:12 -07:00
Joan Lung
d31f5ed876 Merge pull request #17280 from TechnoAlchemisto/I_can't_escape_my_cycles_of_guilt 
Security Fashion Refactor
 2016-05-01 19:33:22 -04:00
phil235
c6da874c9b Merge pull request #17261 from ChangelingRain/sporeless 
Blob spores now put the factory on cooldown when they die
 2016-05-01 23:50:18 +02:00
TechnoAlchemist
56a2a606c6 helmet standard issue 2016-05-01 13:36:11 -07:00
Remie Richards
77c7640139 fixes some vars on /nanotrasen pilots 2016-05-01 21:25:35 +01:00
Jack Edge
ded656458d Buffs panacea mannitol 2016-05-01 21:15:55 +01:00
Remie Richards
00bdc99254 fixes mecha_pilots not targeting empty mecha correctly, fixes them attacking friendly/their own mecha, adds nanotrasen mecha_pilots. 2016-05-01 19:32:15 +01:00
Remie Richards
f903deb2a2 Allows clothing to alter variables on the wearer, Admin modifiable too! 2016-05-01 18:22:21 +01:00
MMMiracles
a72e48ffe3 the fact this never came up is surprising 2016-05-01 12:20:06 -04:00
Jack Edge
d9aac22800 Code review 2016-05-01 16:10:00 +01:00
Joan Lung
72f25a53e6 Merge pull request #17277 from KorPhaeron/cyborg_buffs2 
Cyborg Blueprints
 2016-05-01 11:05:48 -04:00
c0
20c64fbfbf Blood brood 2016-05-01 17:19:29 +03:00
Jack Edge
56665c70c6 Fleshmend: Diminishing returns; Panacea: Better. 
🆑 coiax, Robustin
tweak: Changeling Fleshmend is much less effective when used repeatedly
in a short time. Changeling Panacea is much more effective at purging
reagents, reducing radiation and now reduces braindamage.
/🆑

Also fixed a description problem in pentacid which isn't true. It
doesn't do brute damage.
 2016-05-01 13:59:50 +01:00
Mercenaryblue
1be07b13ef Paperplane balance fix (#17278) 
Drastically reduced eye damage proc chances
 2016-05-01 12:22:11 +02:00
Jordie
2881b4a09e Merge pull request #17144 from Cheridan/scavengers 
Adds scavengers for ash walkers.
 2016-05-01 19:45:49 +10:00
Jordie
76d5557d90 Merge pull request #17227 from coiax/i-can-participate-too 
Removed objectionable absinthe name, procedurally generates absinthe name instead
 2016-05-01 19:41:53 +10:00
Jack Edge
14a14ccb97 Code review 2016-05-01 10:28:07 +01:00
Cheridan
70d1ecfb68 Fixing conflicts 2016-05-01 04:11:21 -05:00
Cheridan
3981f27e3d Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers 
Conflicts:
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
	icons/mob/animal.dmi
	icons/mob/mob.dmi
 2016-05-01 04:06:26 -05:00
Cheridan
0a45f89bdc Finishes scavengers 2016-05-01 03:51:25 -05:00
Jordie
9c53ce5f85 Merge pull request #17240 from Core0verload/firecabinet_decon 
Wall-mounted extinguisher cabinets are now constructable/deconstructable
 2016-05-01 18:09:25 +10:00