cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,438 Commits 61 Branches 14 Tags
047de23ee0f97bf59ecc0a8564ed622f835948db
Commit Graph

310 Commits

Author SHA1 Message Date
Steelpoint
03a98a6295 HoSBeret 2014-11-16 22:32:01 +08:00
hornygranny
509c07650f Merge pull request #5802 from paprka/EATITFATTY 
Clothing sprite/file path changes
 2014-11-15 20:28:43 -08: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
1d2fac2162 Resisting out of a closet no longer fails when locker is moved. 2014-11-12 18:06:39 +01: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
Menshin
cdd5128d47 Removed hilarious but useless sleep() in closets/boxes New() 2014-11-10 01:59:32 +01: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
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
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
phil235
bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
phil235
2a3098d5a8 Fix 2014-11-07 00:39:19 +01:00
phil235
e86c45b190 Removing some "text(...)" stuff. 
Little fixes in closets.dm
Adding bullet_act, blob_act and ex_act to fireaxecabinet so it drops the axe when destroyed. You can now break the cabinet's glass with projectiles (with damage >=15).
Adding ex_act to extinguisher cabinet so it sometimes drops the extinguisher when destroyed.
 2014-11-07 00:28:24 +01:00
Daniel
13d955ed47 Fixed #3752 2014-11-06 01:55:57 +01:00
phil235
48ad48acce Add a fail message to unbuckling, breaking out of cuffs and closets and performing CPR. 2014-11-04 20:30:04 +01:00
phil235
74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation 
Conflicts:
	code/modules/mob/living/living.dm
 2014-11-04 18:55:07 +01:00
hornygranny
d5b8ed3155 Merge pull request #5460 from paprka/rdturtle 
Adds RD turtleneck and updates whimsy
 2014-11-03 18:18:18 -08:00
paprka
1b6eb8afec Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-11-03 17:57:40 -08:00
hornygranny
7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings 
Soap, lube, and janitor tweaks
 2014-11-03 17:19:37 -08:00
Ergovisavi
46a3170b2a Firefighting changes: 
-Firesuit level protection will not entirely protect you from being set on fire. You will gain small amounts of heat while on fire.
-Overhauls the Atmos Water Backpack into a more effective firefighting tool
-Adds a secure ATMOS closet containing said atmos water backpack to the code, but is not on the map as the backpack already exists in the ATMOS hardsuit object at this moment
 2014-11-03 10:25:12 -08:00
phil235
1506383b2c Adding some missing do_attack_animation() 
Moving do_attack_animation() proc to mob/living
Fixing the pixel offset issue from beds especially rollerbed.
Fixing the nograv bouncing stopping because of another animation being used.(lying down, jittering, attack animation)
 2014-11-03 15:11:39 +01:00
phil235
8b49caa5ee Fixes typos and show messages. Fixes attack animation code. 2014-11-03 01:06:02 +01:00
phil235
3f30912c51 WIP - Adding attack animation to most attacks. 
Fixing a couple "for(......) show_message()".
 2014-11-02 22:50:58 +01:00
paprka
393dcaade7 changes scrub spawn to one of each instead of RNG 2014-10-30 20:28:26 -07:00
paprka
920739c8ab defibrillators initial commit 2014-10-30 14:53:51 -07:00
paprka
7c9b23024a readds holosign to janicloset by default 2014-10-27 11:55:33 -07:00
paprka
873c3f41e2 Merge branch 'master' of https://github.com/tgstation/-tg-station into rdturtle 
Conflicts:
	icons/mob/uniform.dmi
 2014-10-26 00:30:44 -07:00
paprka
1f3c2ee85c readds RD updated krieger jumpsuit and updates turtleneck 2014-10-25 19:24:40 -07:00
paprka
458f455340 adds RD turtleneck to replace whimsy 2014-10-25 15:02:21 -07:00
paprka
51a4bd7be6 drill sergeant hat for HoS instead of police 2014-10-25 13:51:36 -07:00
paprka
9cc31a3b85 adds HoS black police hat, and other changes 2014-10-24 04:19:11 -07:00
paprka
b136cf653c wet floor signs and advanced janitor research 2014-10-23 13:43:42 -07:00
hornygranny
3a98979572 Merge pull request #5393 from paprka/cooljackets 
Adds bomber and leather jackets + toolbelt improvements
 2014-10-22 16:43:42 -07:00
Cheridan
a5e3851b99 Merge pull request #5216 from phil235/bodybagfix1 
closets can no longer contain a near infinite amount of mobs.
 2014-10-21 12:15:30 -05:00
hornygranny
e556867a58 Merge pull request #5277 from paprka/newshotguns 
Adds improvised shotguns and fixes paths for wrap paper
 2014-10-21 09:51:35 -07:00
phil235
c2fcd21499 Adding bluespace bodybags. Adding changelog. 2014-10-21 17:27:40 +02:00
phil235
56c853f9d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/mouse.dm
 2014-10-21 15:58:39 +02:00
paprka
c4668885ec Merge branch 'master' of https://github.com/tgstation/-tg-station into cooljackets 
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
 2014-10-20 21:38:39 -07:00
paprka
74dfbeb92c adds bomber and leather jackets 2014-10-20 21:36:40 -07:00
hornygranny
1c9c6d5950 Merge pull request #5249 from phil235/DisplacedGirderFix 
Fix for #4602
 2014-10-20 20:18:06 -07:00
paprka
2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns 
Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi
 2014-10-19 17:30:47 -07:00
Cheridan
4adb8c0c9a Merge pull request #5316 from xxalpha/fix_flasher 
Fixes cyborgs being able to add their flashes to things
 2014-10-19 17:44:30 -05:00
xxalpha
d9dafa9649 Fix cyborg flashes being useable in flashers and cyborg heads. 2014-10-19 04:35:10 +01:00
paprka
8312c52286 Merge branch 'master' of https://github.com/tgstation/-tg-station into removegreyshirt 
Conflicts:
	icons/mob/uniform.dmi
 2014-10-16 21:29:10 -07:00
Remie Richards
e124c29f8d Merge pull request #5201 from Cheridan/permits 
Adds Construction Permits
 2014-10-17 05:24:37 +01:00