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

7619 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
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
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
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
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
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
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
TechnoAlchemist
03bce7b03d three two one let's jam 2016-04-30 03:01:38 -07:00
KorPhaeron
946fac13dd Cyborg Blueprints 2016-04-30 03:47:51 -05: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
Nerd Lord
03e8f0da61 if you see something say nothing and drink to forget 2016-04-29 23:06:53 -04:00
Nerd Lord
8ef63673d5 if you see something say nothing and drink to forget 2016-04-29 22:14:04 -04:00
Nerd Lord
8a6d36061e Each cable coil color now has inhands 2016-04-29 22:10:11 -04:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes 
No longer deaf while inside pipes
 2016-04-29 20:34:03 -05:00
KorPhaeron
8964eaebb7 Merge pull request #17259 from Core0verload/tools.dmi 
Moves tools from items.dmi to tools.dmi
 2016-04-29 20:31:29 -05:00
c0
846d419b30 Moves tools from items.dmi to tools.dmi 2016-04-30 04:12:12 +03:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
phil235
7900f80544 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge 
Conflicts:
	code/game/objects/structures/aliens.dm
 2016-04-29 20:58:02 +02:00
phil235
b1c1925b7c Change gib animation sprites to only loop once. 2016-04-29 20:48:56 +02:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205) 
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
 2016-04-29 20:29:20 +02:00
Cheridan
1e0c5acd1f Merge pull request #17211 from phil235/FixThermiteBorg 
Fix bundle: borg module, thermite, chairs
 2016-04-29 13:22:50 -05:00
nullbear
e806e74000 Can be detonated without a grenade assembly. 2016-04-29 09:49:55 -07:00
nullbear
b9eed91c0d fixes advanced release grenade being omnipresent. 2016-04-29 09:42:53 -07:00
Razharas
ae78dd582a Merge pull request #17208 from phil235/FixMechaMaskToxin 
Fix bundle and mech melee attack animation
 2016-04-29 19:32:38 +03:00
Joan Lung
2bd45f793b Merge pull request #17239 from Core0verload/nanofix 
One symbol fix
 2016-04-29 10:23:35 -04:00
KorPhaeron
315c6619f4 Merge pull request #17193 from TechnoAlchemisto/belttweak 
Tweaks some storage issues with the explorer belt.
 2016-04-29 08:50:01 -05:00
Razharas
6f8b1bc295 Merge pull request #17124 from MrPerson/wrapped_up_nicely_with_a_bow 
Removes monkeycube and chocolate unwrapping
 2016-04-29 16:03:59 +03:00
Razharas
81dadcec5f Merge pull request #17086 from MrPerson/planes_on_a_snake 
Move some stuff from different layers to different planes
 2016-04-29 15:51:41 +03:00
Razharas
21e554187d Merge pull request #17056 from Bawhoppen/randomrebalances 
Some random TC price rebalances
 2016-04-29 15:44:02 +03:00
c0
a7088757ed Wall-mounted extinguisher cabinets are now constructable/deconstructable 2016-04-29 15:31:23 +03:00
Razharas
ce966f72c3 Merge pull request #16953 from Core0verload/onehalf 
Adds a new derelict to space ruins
 2016-04-29 15:23:50 +03:00
Razharas
c986212ddb Merge pull request #16778 from Robustin/commitcommoncult 
The Cult Rises...
 2016-04-29 15:10:16 +03:00
c0
44c1917de2 One symbol fix 2016-04-29 13:48:36 +03:00
nullbear
5cd0cca621 Adds more reuseable c4 type path. Adds x4. Fixes chembomb recipe. 2016-04-29 03:31:17 -07:00
Cheridan
034500f622 Merge pull request #17188 from phil235/FixClosetStuffing 
Fixes weird shit happening when clickdragging things from your
 2016-04-28 23:49:34 -05:00
Cheridan
1e800a04b4 Merge pull request #17186 from phil235/FixMisterSlotFlag 
Fixes the backpack watertank's water mister spray being equippable on…
 2016-04-28 23:24:45 -05:00
Cheridan
fbd16c77cd Merge pull request #16934 from Core0verload/cargo 
Changes to Stocks Console UI, cargo fixes
 2016-04-28 23:22:17 -05:00
Cheridan
6e27f01c94 Merge pull request #17185 from phil235/FixBundle48 
Fix Bundle: holosign creator, status procs, teleporter hub, timestop effect
 2016-04-28 22:11:29 -05:00
Nerd Lord
49dd259cbc Attacking a locker or crate with an ID-containing object will toggle the lock instead of opening it 2016-04-28 22:34:37 -04:00
phil235
9b5950000e overlay effect should be immune to explosions. 2016-04-29 04:21:08 +02:00
phil235
2cc2341536 Fixes runtime when using gibself on an animal. 
Fixes gib animation never appearing for carbons.
gib() now has a "no_organs" argument to not spill organs on gib().
gib() also no longer waits for the gib animation to finish before actually qdeling the mob (which was causing the possibility of multi-gibbing animation during cult sacrifice.
Gibself no longer spill organs.
Simple_animal no longer show "X stops moving" when gibbed.
 2016-04-29 03:57:16 +02:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
phil235
d5af5ca696 Objects with invisibility = 101 are ignored by procs like view() that are used for say() and visible_message(). 
Objects that are simply hidden (instead of being abstract things) now always use invisibility = 100.
This fixes not being able to hear what you say while inside a hidden gas/disposal pipe.
Fixes the t-ray scanner revealing abstract object that should never be seen, like spacevine controller.
Fixes not hearing anything during a mob transformation.
 2016-04-29 00:04:40 +02:00
phil235
be57a223b5 Moves alien structure into the proper folder objs/structures/aliens.dm 
Removes incorrect comment about forcedodge projectile.
 2016-04-28 22:44:26 +02:00