cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,489 Commits 61 Branches 14 Tags
e8ca9ec22431aedeebc28703880204792df4bc0c
Commit Graph

819 Commits

Author SHA1 Message Date
fleure
e8ca9ec224 Fixes multiple airlocks on same tile 2014-11-23 16:32:24 +00:00
Cheridan
e1b5a6815b Merge pull request #5856 from tkdrg/anotherbrickinthewall 
Wall cleanup, attempt #2
 2014-11-22 17:04:34 -06:00
hornygranny
dce9dadea2 Merge pull request #5914 from paprka/removewindows 
Changes most border windows/firelocks to full tile
Gets paprika killed
 2014-11-21 11:47:04 -08:00
Cheridan
8bfed4258b Merge pull request #5922 from Steelpoint/BeretHoS 
HoS Beret + Warden Drill Hat
 2014-11-19 10:26:27 -06:00
paprka
bda5947d30 improves firelocks, window damage, and window deconstruction 2014-11-18 18:25:47 -08:00
Cheridan
c98448b5c2 Merge pull request #5650 from phil235/MechAtkFix1 
All mechs get a melee attack
 2014-11-18 12:53:52 -06:00
paprka
537c0705c9 health tweak to be additionally rounded 2014-11-16 20:54:19 -08:00
paprka
8ee2330c0f fixed metastation, fixed basic window having no icon state 2014-11-16 17:57:29 -08:00
paprka
4822519c44 adds help intent check for repairing windows 2014-11-16 17:35:06 -08:00
paprka
c009049033 added window repairing 2014-11-16 17:26:55 -08:00
paprka
fd910387c3 windows damage and such 2014-11-16 17:13:33 -08:00
paprka
007ab4dd08 shuttle windows 2014-11-16 15:59:46 -08:00
paprka
706e03bd1b Full tile window placing on grilles 2014-11-16 14:29:39 -08:00
Steelpoint
03a98a6295 HoSBeret 2014-11-16 22:32:01 +08:00
tkdrg
76edb3e44d Merge remote-tracking branch 'upstream/master' into anotherbrickinthewall 
Conflicts:
	code/game/turfs/simulated/floor/misc_floor.dm
 2014-11-16 01:30:24 -03:00
hornygranny
509c07650f Merge pull request #5802 from paprka/EATITFATTY 
Clothing sprite/file path changes
 2014-11-15 20:28:43 -08:00
hornygranny
b6d0531c34 Merge pull request #5865 from paprka/hornygrannysuxlmaoxdplsmerge 
Fixes a glass table related exploit
 2014-11-14 10:54:39 -08:00
Remie Richards
b9f7496870 Merge pull request #5838 from tkdrg/lasertube 
Lasers can now go through transit tubes
 2014-11-14 18:21:50 +00:00
Remie Richards
890ad08d4b Merge pull request #5851 from phil235/ContainerBreakOutFix 
Resisting out of a closet no longer fails when locker is moved.
 2014-11-14 18:20:09 +00:00
paprka
ec6b2424d2 purge the unused 2014-11-13 21:10:53 -08:00
paprka
40cdf3ffec swat mask overhauls and such 2014-11-13 18:36:30 -08:00
phil235
a005055cf3 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
 2014-11-13 17:17:23 +01:00
paprka
85d879fbf4 Removes brute damage from tabling 2014-11-12 19:54:33 -08:00
paprka
020d28fe3b fixes a few glass table related bugs and adds more fun 2014-11-12 18:48:01 -08:00
tkdrg
d23edbd3b7 Merge remote-tracking branch 'upstream/master' into wallz 
Conflicts:
	code/game/objects/structures/false_walls.dm
	code/game/turfs/simulated/walls_mineral.dm
 2014-11-12 20:11:20 -03:00
tkdrg
393e5d6801 Wall cleanup, moving stuff into proper procs in the children objects when possible 
Broken walls now drop a multi-sheet metal stack instead of many 1-sheet stacks

Walls now have a builtin_sheet for performance. Also fixes bananium wall bugs with not dropping the mineral.
 2014-11-12 20:07:18 -03:00
phil235
1d2fac2162 Resisting out of a closet no longer fails when locker is moved. 2014-11-12 18:06:39 +01:00
tkdrg
6dfc9bbaac Lasers can now go through transit tubes 2014-11-11 21:46:36 -03:00
paprka
56316c6129 bad placement for this particular line 2014-11-11 16:37:47 -08:00
paprka
da5cd74d53 fixes rack dupe exploit 2014-11-11 16:31:50 -08:00
hornygranny
f00d32abc1 Merge pull request #5803 from Menshin/sleeping_in_closets 
Removes hilarious but useless sleep() in closets/boxes creation
 2014-11-11 10:55:07 -08:00
paprka
3fb5d14468 Merge branch 'master' of https://github.com/tgstation/-tg-station into EATITFATTY 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
 2014-11-10 11:43:46 -08:00
hornygranny
d39265bb55 Merge pull request #5717 from phil235/FireaxecabinetBulletFix 
Fireaxecabinet bullet fix
 2014-11-10 08:22:38 -08:00
Swag McYolosteinen
9893fbc86f Merge pull request #5645 from Ergovisavi/firefighting 
Firefighting changes
 2014-11-10 16:55:38 +01:00
Menshin
cdd5128d47 Removed hilarious but useless sleep() in closets/boxes New() 2014-11-10 01:59:32 +01:00
paprka
9af72bda1f compile fixes 2014-11-09 15:01:46 -08:00
paprka
0ffba02112 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables 
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/objects/structures/tables_racks.dm
 2014-11-09 14:53:19 -08:00
Ergovisavi
481a282ca8 Adds NODROP to the Atmos watertank nozzle. I have no regrets. 2014-11-09 13:56:12 -08:00
paprka
32e9cd70c4 maskes 2014-11-09 13:46:30 -08:00
Ergovisavi
2c74fc8dbb -Adds secure atmos closets to Atmos 
-Removes a redundant check in water's obj reaction, add's a "cooling power" var that determines how effective it is at cooling off hotspots
-Modifies extinguishers a bit to have more options, affect more tiles, change the cooling temperature of the water inside of it, etc
-Makes the water backpack for atmos even more robust at fighting fires with a 5 tile spread, removes converting oxygen to nitrogen on Nanofrost, made the resulting end of a firefight annoying as the atmos tech would have to get an oxygen canister
-Makes racks use Move() to put objects on top of them instead of just changing the loc, in order to stop nozzles/misters from getting on them
 2014-11-09 11:16:58 -08:00
Cheridan
86d0422881 Merge pull request #5739 from hornygranny/lattices 
lattice and grille deconstruction refactor
 2014-11-08 21:21:53 -06:00
hornygranny
e392609b6f Merge pull request #5425 from Menshin/meteor_redux 
Meteors redux
 2014-11-08 15:24:44 -08:00
Menshin
c724b54892 * Fixes meteors infinigibs and infinisplosions (#5226) 
* Made meteors more threatening
* Added an ultra rare station buster Tunguska meteor
* Made admin-spawned meteor not instantly delete
* Added several types of meteor waves : normal, threatening, catastrophic which are randomly choose at wave start
* Meaty ores now spawn blood on tiles instead of busting them
* Differentiates regulars and reinforced girders ex_act
* Changelog included
 2014-11-08 14:43:48 +01:00
Ergovisavi
9c1366d65f Adds a new define for temperature protection for more robust firefighting gear 
Adds Atmos Firesuits, Atmos Firesuit Helmets, sprites for all the firefighting gear etc
 2014-11-08 02:14:37 -08:00
Cheridan
3854ab4763 Merge pull request #5707 from Donkie/closetbudgefix 
Fixed #3752 It won't budge!!!11
 2014-11-07 20:08:38 -06:00
phil235
9e487bb33a derp 2014-11-07 22:38:52 +01:00
Hornygranny
c8ffcf51ae lattice and grille deconstruction refactor 2014-11-07 13:36:28 -08:00
Cheridan
594fd9d3e2 Merge pull request #5271 from Menshin/html_sanitization 
Text input sanitization (take 1)
 2014-11-07 13:56:20 -06:00
phil235
8ac93c41db Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1 
Conflicts:
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
 2014-11-07 20:16:14 +01:00
Remie Richards
0914b1a7cd Merge pull request #5642 from phil235/AttackAnimation 
Adding an attack animation to most attacks
 2014-11-07 18:39:27 +00:00