cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,258 Commits 61 Branches 14 Tags
2c19d113bd6c2188e96da6a709d16546bcc9495a
Commit Graph

3090 Commits

Author SHA1 Message Date
Alex
ac4b0954f0 Merge pull request #4587 from Firecage/showerloggingprints 
Shower logging and prints
 2014-08-31 12:32:31 +01:00
Joonatan O'Rourke
492a043f47 fixed reinforced tables 
Fixes not being able to place wrenches on (unweakened) reinforced
tables. The return statement in the conditional for the wrench in
attackby was preventing control from reaching the conditional later on
that places the wrench on the table. The conditional for the wrench now
checks if it can destroy the table, and if not it continues down to
where it is then placed on the table. table_destroy is now guaranteed to
destroy the table. Also removed the now redundant check in table_destroy
and made it more portable between different kinds of tables. Also fixed
an obvious typo.
 2014-08-28 20:02:55 +03:00
Firecage
f20c97b59e Updates to shower 2014-08-28 12:02:36 +02:00
Firecage
465f23e184 The shower will now both log it and add hidden fingerprints when you wrench it to change the temperature. 2014-08-27 16:37:39 +02:00
Cheridan
0198ec2bde Merge pull request #4576 from Firecage/SPANCLASSES 
SPANCLASSES!!!!!
 2014-08-26 15:05:12 -05:00
Swag McYolosteinen
93e5918abc Merge pull request #4381 from Ikarrus/burglaralarm 
Burglar Alarm for Captain's Display Case
 2014-08-26 19:36:04 +02:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Alex
d0a1eae3f9 Merge pull request #4517 from Firecage/fixchamproj 
This fixes the chameleon projector.
 2014-08-24 13:02:50 +01:00
Alex
f0a8437231 Merge pull request #4457 from Ikarrus/falsewall_cheese 
Mobs will block false walls from closing
 2014-08-24 13:00:50 +01:00
Alex
944966ba93 Merge pull request #4520 from Firecage/Messagefixes 
This fixes the message issues
 2014-08-24 12:59:52 +01:00
Cheridan
b33320e6b6 Merge pull request #4514 from Firecage/fix1 
Fix for 1 use freedom implant
 2014-08-22 09:52:34 -05:00
Alex
6b1cae6904 Merge pull request #4460 from Ikarrus/deathsquad 
Adds Deathsquad to Quick-Create Antagonist Menu
 2014-08-22 08:26:09 +01:00
Cheridan
a7c0ca8dfd Merge pull request #4506 from Jordie0608/itsawondernanotrasendoesntreplaceweldingfuelwithsomethinglessvolatile 
Makes welderbombs use fueltank's ex_act
 2014-08-21 22:14:13 -05:00
ikarrus
0891744c8e Resolved Conflicts: 
_maps/map_files/tgstation.2.1.3.dmm
 2014-08-21 19:47:30 -06:00
Firecage
4198e61af1 This fixes the message issues 2014-08-22 01:15:13 +02:00
Firecage
9df78f3681 This fixes the chameleon projector. 2014-08-21 17:02:13 +02:00
Firecage
f5c3d0b9cf Fix for 1 use freedom implant 2014-08-21 16:11:26 +02:00
Jordie0608
f17200bc7f Makes welderbombs use fueltank's ex_act 2014-08-21 00:56:17 +10:00
Swag McYolosteinen
8c910a3b10 Merge pull request #4414 from Lo6a4evskiy/2014-08-14-Welding-lockers 
Fixes for welders and lockers
 2014-08-19 12:28:58 +02:00
Lo6a4evskiy
dbb7fd9ffe Locker should be open for cutting apart 2014-08-19 13:56:27 +04:00
Alex
99fae13391 Merge pull request #4393 from paprka/emptyclick 
Empty gun click noise
 2014-08-19 10:36:06 +01:00
Alex
c8bd6af8bf Merge pull request #4480 from Incoming5643/statuefix 
fixes #4479
 2014-08-19 10:20:56 +01:00
ikarrus
0be874efff -Added proc for setting the flashing red alarm lights 
-moved all the Related Areas checking for fire alarms into the procs in areas.dm
-Added sound for burglar alarm due to popular request
 2014-08-18 21:27:42 -06:00
Swag McYolosteinen
5e696e9cd7 Merge pull request #4374 from kyrahabattoir/DynamicMaintenanceLoot 
Dynamic maintenance loot table and map modification.
 2014-08-18 19:27:02 +02:00
Alex
5c5e54342d Merge pull request #4470 from Ikarrus/gibsounds 
Added a sound for Gibbing
 2014-08-18 08:03:47 +01:00
Incoming
68bcb4dbbd fixes #4479 2014-08-17 23:55:26 -04:00
KyrahAbattoir
7fb2e5351b Removed flash from the maintenance loot table. 
set armory_contraband to not spawn duplicates (as it initially was).
 2014-08-18 05:41:52 +02:00
KyrahAbattoir
37f9716fb5 Added loot tables for the maintenance and the contraband locker (removed the map edit for now) 2014-08-18 05:40:15 +02:00
Aranclanos
b0f0d01d36 Merge pull request #4427 from Cheridan/blow_up 
Advanced Shotshells
 2014-08-17 15:35:08 -03:00
Lo6a4evskiy
80dea1edb3 Now it only checks if closet is open at the moment of welding. Also removed useless message. 2014-08-17 18:17:48 +04:00
Alex
7413f743c8 Merge pull request #4451 from Firecage/structureabsolutes 
absolute paths for the structure folder files
 2014-08-17 13:45:13 +01:00
ikarrus
be077176ee Used the gibspawner instead 2014-08-16 19:17:39 -06:00
Alex
3fd2886eb0 Merge pull request #4420 from Lo6a4evskiy/2014-08-14-Broken-grilles 
Broken grilles will not spawn rods when hit
 2014-08-16 13:39:35 +01:00
MrPerson
09071b88d5 Merge pull request #4357 from paprka/nerfninja 
Makes ninja less stupidly broken (balancing)
 2014-08-16 04:13:49 -07:00
ikarrus
d56274a4ab Adds Deathsquad to Quick-Create Antagonist Menu 
-Pressing this button will spawn up to 5 death commandos on centcom with a customizable objective
-Added a shuttle console to the ferry that, rather than moving the shuttle, will send a request to admins instead
-Deathsquaddies get an energy shield
-Deathsquad beret will no longer hide head, face, and hair
 2014-08-16 00:40:37 -06:00
ikarrus
01fd7a9dd9 Mobs will block false walls from closing 
I observed a round where a player cheesed the AI Chamber during Malfunction by closing false walls on himself and using that as a shield against electrodes, lasers, and the cleaner fluid. This is to prevent that.
 2014-08-15 20:10:45 -06:00
Firecage
146af7607c absolute paths for the structure folder files 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
 2014-08-16 00:01:04 +02:00
Alex
74c22755be Merge pull request #4365 from paprka/fingerlessgloves 
Adds fingerless gloves, other glove related changes
 2014-08-15 08:03:37 +01:00
Cheridan
148d16397b Advanced Shotshells 
adds 3 new types of shotgun ammo. make them by crafting the special shell in RND, and then using table-crafting to make the unique ammo.dmi

meteorshot, made with compressed matter cartridges
pulse slugs, shotgun rounds with the properties of a laser weapon.
dragonsbreath rounds, area-of-effect flame weapons.
renames ammunition/bullets.dm to ammunition/ammo_casings.dm, which is more accurate

splits RND designs up into their own files
 2014-08-14 12:15:10 -05:00
Lo6a4evskiy
54c8cc0f66 Some cleanup 2014-08-14 13:56:19 +04:00
Lo6a4evskiy
04ce0616e7 Cannot place one-way glass by clicking on destroyed grille 2014-08-14 13:50:41 +04:00
Lo6a4evskiy
6b628667ed Accidentally left unnecessary comment 2014-08-14 13:36:00 +04:00
Lo6a4evskiy
b76595d03e Broken grilles won't summon new rods when hit 2014-08-14 13:33:10 +04:00
Lo6a4evskiy
48976301c4 Welders won't weld if they're off. Welders won't finish welding if Toggle Open was used in the process. 2014-08-14 02:11:39 +04:00
paprka
bbf90b10d3 span fixes 2014-08-12 02:15:07 -07:00
Alex
ff25503b4d Merge pull request #4384 from Ikarrus/deputybands 
[MAP] Boxstation Update and Deputy Armbands
 2014-08-12 08:12:15 +01:00
paprka
e97f21a24a empty weapon click 2014-08-11 22:56:05 -07:00
Alex
9cfb19f511 Merge pull request #4373 from paprka/deepgunlore 
Whole bunch of gun-related stuff
 2014-08-11 16:25:05 +01:00
Alex
53d9aca271 Merge pull request #4371 from paprka/bowmanheadsets 
Bowman radio headsets
 2014-08-11 14:13:26 +01:00
Swag McYolosteinen
55a11982da Merge pull request #4361 from paprka/swatremoval 
Replaces swat helmet for syndicates
 2014-08-11 12:15:56 +02:00