cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 02:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,598 Commits 61 Branches 14 Tags
3eeb0cb8e92fbf6ce770ec91d40fbd511ffd4453
Commit Graph

26778 Commits

Author SHA1 Message Date
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
MMMiracles
a72e48ffe3 the fact this never came up is surprising 2016-05-01 12:20:06 -04:00
Joan Lung
72f25a53e6 Merge pull request #17277 from KorPhaeron/cyborg_buffs2 
Cyborg Blueprints
 2016-05-01 11:05:48 -04: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
Jordie
5b945c4b9a Merge pull request #17270 from Core0verload/mech_equip 
Makes some passive mech equipment unselectable
 2016-05-01 18:04:56 +10: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
Lzimann
d19c750a06 Oops. 2016-04-30 22:58:21 -03: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
KorPhaeron
3f486d82c8 Merge pull request #17246 from tgstation/RemieRichards-vote-improvements 
vote improvements
 2016-04-30 13:44:06 -05:00
Jack Edge
f79a2a07d7 Fixes bug where it didn't work 2016-04-30 16:09:21 +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
AnturK
91fd7d4212 Merge pull request #17210 from Zuvassin/redoingbecausemergefailfml 
Fixes issues with survival pod GPS and Fans not able to be deconstructed
 2016-04-30 14:06:27 +02:00
Cheridan
35a975f82b Merge pull request #17221 from phil235/FixGib 
Fixes bugs with gib()
 2016-04-30 06:58:29 -05:00
bgobandit
e5ed72520e Ports Cards Against Spess from Polaris (MERGEPLS) (#15872) 
* Ports Cards Against Spess from Polaris

* moar

* more

* Moves cards to config files, adds a fuckton more

* ADDS THE FUCKING CARDS TO THE FUCKING MAP TAKE 3 HATE SALT

* fixes the maps, shuts travis THE FUCK UP

* fixes typo

* makes requested changes
 2016-04-30 13:35:51 +02:00
phil235
84dcf0dd3f dammit. 2016-04-30 12:33:12 +02:00
KorPhaeron
d8db2a1643 Merge pull request #17224 from ChangelingRain/IDlock 
Hitting a locker or crate with an ID, PDA with ID, or wallet with ID will try to toggle the lock instead of opening it
 2016-04-30 05:32:42 -05:00
phil235
04018648d1 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixGib 
Conflicts:
	code/modules/mob/living/death.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2016-04-30 12:30:36 +02:00
Cheridan
5a766b0a63 Merge pull request #17236 from optimumtact/patch-2 
Fix call to add reagent for inacusiate
 2016-04-30 05:27:14 -05:00
Cheridan
718d80fa84 Merge pull request #17238 from optimumtact/patch-4 
Dead code trimming
 2016-04-30 05:25:49 -05:00
Cheridan
1dd607aa4c Merge pull request #17237 from optimumtact/patch-3 
bail out of findJoinDate when no server response
 2016-04-30 05:14:30 -05:00
TrustyGun
9feb71f7a6 move legion skull to mining.dmi 2016-04-30 06:03:12 -04:00
TechnoAlchemist
03bce7b03d three two one let's jam 2016-04-30 03:01:38 -07:00
TrustyGun
837739df65 Merge branch 'master' of https://github.com/tgstation/-tg-station into lavaland_cuisine 2016-04-30 05:52:50 -04:00
Cheridan
7644c7f47c Merge pull request #17235 from optimumtact/patch-1 
Prevent negative sqrts in dna heal
 2016-04-30 04:21:15 -05:00
KorPhaeron
946fac13dd Cyborg Blueprints 2016-04-30 03:47:51 -05:00
KorPhaeron
1a18d00fe1 No more mindswapping with bosses 2016-04-30 02:22:43 -05:00
c0
19af2d58d5 Removes "Exosuit Module" from mecha board design names 2016-04-30 10:20:25 +03:00
KorPhaeron
f4f6a64a1c Fixes Dragon Log Spam 2016-04-30 02:03:30 -05:00
c0
d9a95b1e4a Makes some mech equipment inactive 2016-04-30 09:50:16 +03:00
Jordie
53fd10c54b Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake 
Revert "Move some stuff from different layers to different planes"
 2016-04-30 15:34:17 +10:00