cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-06 22:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,647 Commits 63 Branches 14 Tags
d191efc751ed3ec43ebe1d4c840540c1095db152
Commit Graph

15546 Commits

Author SHA1 Message Date
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
4ee3d491e7 Corrected incorrect description of booze 2016-05-02 22:23:36 +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
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
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
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
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
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
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
d0dcd62e87 Merge pull request #17268 from Core0verload/grubgrub 
Goldgrub no longer can burrow into the station floor
 2016-05-01 17:50:09 +10:00
Jordie
c5812d625e Merge pull request #17263 from lzimann/hogstuff 
Some Hand of God fixes
 2016-05-01 17:45:56 +10:00
Jordie
370cb1b1da Merge pull request #17273 from Core0verload/mechboard_naming 
Removes "Exosuit Module" from mecha board design names
 2016-05-01 17:38:12 +10:00
Jordie
9df519629f Merge pull request #17260 from Core0verload/fuckoldpotency 
Fixes MK-HONK shoes spawning useless banana peels
 2016-05-01 17:34:09 +10:00
nullbear
3d781f1498 Implements freezie floors and buffs frostoil (#17081) 
* Implements freezie floors and buffs frostoil

🆑 nullbear
rscadd: A reminder for crew to avoid mopping floors in cold rooms, as
the water will freeze and provide a dangerous slipping hazard known as
'ice'. Running on it is not recommended.
rscadd: frostoil is deemed an effective chemical for cooling down areas
in the event of a plasma fire.
:/cl:

Makes wet floors freeze in cold environments, and evaporate in warm
environments.

Makes frostoil cool the atmosphere, and make the floor wet. Typically
resulting in icy floors.

Fixes gluon grenade potentially making floors permanently icy.

* tweaks to gluon bomb as per bawhoppens request

* Update syndieminibomb.dm

* Update open.dm

* Update open.dm

* Update syndieminibomb.dm
 2016-05-01 17:26:46 +10:00
Jordie
265938e7d9 Merge pull request #17220 from Incoming5643/badmins_doing_shit 
View vars will now tell you if something has been previously var edited
 2016-05-01 17:02:02 +10:00
Jordie
98655ac6e8 Merge pull request #17219 from TrustyGun/lavaland_cuisine 
Adds Stuffed Legion
 2016-05-01 16:59:11 +10:00
Jordie
f3f0c63e4f Merge pull request #17245 from nullbear/c4-path 
Changes C4 Path and adds X4 breaching charge
 2016-05-01 16:41:07 +10:00
Nerd Lord
c6f8eb6ee5 Watchers now instantly fire at targets instead of setting temperature 2016-04-30 21:27:08 -04:00
erwgd
8a4319c78b added code which sets internals on to plasmaman/before_equip_job 2016-05-01 01:07:54 +01:00
TechnoAlchemist
526236a558 inheritance 2016-04-30 13:42:08 -07:00
Joan Lung
43ada53037 Merge pull request #17272 from KorPhaeron/dragon 
Fixes Dragon Explosion Log Spam
 2016-04-30 15:04:54 -04:00
Jack Edge
80a0e230e2 Suicide and RSF fix 2016-04-30 19:27:13 +01:00
Jack Edge
51d3dc9242 Hand labeler 2016-04-30 18:44:01 +01:00
Jack Edge
f79a2a07d7 Fixes bug where it didn't work 2016-04-30 16:09:21 +01:00
Jack Edge
3d458b857c Service cyborgs get a spraycan 
🆑 coiax
rscadd: The Service cyborg module now has a spraycan built in, for
hijinks and passing on important urban messages.
/🆑
 2016-04-30 15:26:22 +01:00
Cheridan
55514c3be6 Merge pull request #17233 from coiax/mining-item-stats 
Added more stat tracking to mining items and engine generation
 2016-04-30 08:21:41 -05:00