cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 04:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,268 Commits 61 Branches 14 Tags
40cdf3ffec2c01c98fe970bc44da4eb24d3c62db
Commit Graph

3671 Commits

Author SHA1 Message Date
paprka
40cdf3ffec swat mask overhauls and such 2014-11-13 18:36:30 -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
7ce90ff54a Merge pull request #5654 from GunHog/Potato_AI_Wants_To_Hear_You_Scream_Too 
Gives Traitor AIs the Syndicate Channel!
 2014-11-10 17:18:04 +01:00
hornygranny
fa735ea9ed Merge pull request #5768 from paprka/mophands 
Fixes no inhand for advanced mop
 2014-11-10 08:16:22 -08:00
Swag McYolosteinen
9893fbc86f Merge pull request #5645 from Ergovisavi/firefighting 
Firefighting changes
 2014-11-10 16:55:38 +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
GunHog
4bc6ded418 Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too 
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
 2014-11-09 12:27:48 -06:00
paprka
9be60df479 fixes no inhand for mop 2014-11-08 19:28:13 -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
hornygranny
62003a8ab8 Merge pull request #5700 from RemieRichards/SiliconLawCap 
Adds a config option to cap silicon laws. [NEW CONFIG OPTION]
 2014-11-08 15:22:09 -08:00
hornygranny
4ff8507c85 Merge pull request #5727 from phil235/RecorderFix 
Fixes the tape recorder. (one typo)
 2014-11-08 15:07:47 -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
53bf024dbe Merge pull request #5545 from RemieRichards/DiseaseRework 
Disease Code Partial Rework
 2014-11-08 00:17:47 -06:00
Cheridan
15b16e1f67 Merge pull request #5726 from paprka/traitorbeltthing 
Adds disguised med analyzer to medibelts
 2014-11-07 23:39:56 -06:00
hornygranny
efb3877fcf Merge pull request #5682 from paprka/fixdefib 
Defibrillator Hotfixes
 2014-11-07 19:49:04 -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
2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
 2014-11-08 01:07:29 +00:00
paprka
7bde69c3a7 emagged defibs now make people gasp 2014-11-07 16:17:58 -08:00
paprka
774e82de06 Buffed weaken of safety off defibs and removed burn damage 2014-11-07 16:17:11 -08: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
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
Cheridan
e2bf3eca4b Merge pull request #5705 from Donkie/batonfix 
Fixes #5691 - Batons incorrectly giving messages
 2014-11-07 10:27:09 -06:00
Cheridan
3f16a966b2 Merge pull request #5712 from xxalpha/amilli 
Increases gold content per Robust Gold cigarette to 1
 2014-11-07 10:09:54 -06:00
Cheridan
669a20df77 Merge pull request #5708 from paprka/stupidfuckup 
Fixes utility medipen bundle for miners
 2014-11-07 10:03:46 -06:00
phil235
bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
phil235
7ca1c48206 Fix the tape recorder. 2014-11-07 10:52:52 +01:00
paprka
e5db75d756 adds disguised med analyzer to medibelts 2014-11-06 21:36:54 -08:00
paprka
d76e4f62e5 added deconstructing 2014-11-06 18:01:19 -08: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
Remie Richards
c59e9ee20c Merge pull request #5665 from phil235/CPRFailMsg 
Add a fail message to unbuckling, breaking out of cuffs and closets and CPR.
 2014-11-06 22:18:02 +00:00
Remie Richards
09e6825b5d Merge pull request #5692 from Aranclanos/TKihateyou 
Computers and telekinesis fix
 2014-11-06 21:56:31 +00:00
xxalpha
e1a06faa9b Increases gold content per Robust Gold cigarette to 1 2014-11-06 18:23:48 +00:00
paprka
b99499e277 fixes utility medipen bundle for miners 2014-11-05 18:02:14 -08:00
Daniel
13d955ed47 Fixed #3752 2014-11-06 01:55:57 +01:00
Daniel
059244387f Fixed #5691 2014-11-06 01:12:15 +01:00
Remie Richards
d1e0ef943c Changes messages to be more appropriate for last commit + more fluffy. 2014-11-05 23:31:51 +00:00
Remie Richards
198b9fee93 Extends the check to include the number of potential laws, from the current aiModule (eg, total_laws (10) + potential laws on board (4) = 14, 14 > 12) 2014-11-05 23:07:24 +00:00
Remie Richards
177225598b Adds a config option for capping the amount of laws silicons can receive via boards, defaults to 12 2014-11-05 22:25:46 +00:00
Aranclanos
f7ad6d9ab0 Fixes issue #1442 
canUseTopic() will now check for telekinesis on humans, using the be_close flag.
The pop-up window will update if TK users are using the machine.
 2014-11-05 13:55:31 -03:00
JJRcop
bfc62a78aa Changes the defibrillator to use HEALTH_THRESHOLD_DEAD as the max damage it heals 
Changes succumb to apply exactly the required amount of oxyloss to die, instead of a hard-coded 200
 2014-11-04 23:48:57 -05:00
paprka
ff78a43bb7 fixes basically everything wrong with defibs right now 2014-11-04 19:33:41 -08:00