cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,267 Commits 61 Branches 14 Tags
a73d22f2ed8fb65cb6bf05c8461fab1fe7dae295
Commit Graph

2136 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Cheridan
594fd9d3e2 Merge pull request #5271 from Menshin/html_sanitization 
Text input sanitization (take 1)
 2014-11-07 13:56:20 -06: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
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
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
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
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
tkdrg
a0b61707a4 NTRC (PDA chatrooms) bugfixes 
Removed operator, revamped structure, fixed a lot of bugs

Adds myself to admins.txt
 2014-11-04 22:47:48 -03:00
paprka
6efb62989f fixes defibs reviving and noclone check 2014-11-04 15:01:22 -08:00
Menshin
b77e2fc46a Conflicts solving 2014-11-04 20:24:52 +01:00
Ergovisavi
40e093de50 Merge branch 'master' of https://github.com/tgstation/-tg-station into firefighting 2014-11-04 10:52:46 -08:00
GunHog
3c58bf7435 Moved some things around! 
All radios now have a keyslot var (replacing keyslot1 for headsets).
- recalculateChannels() proc moved to radios instead of just headsets.
- Removed the duplicated recalc proc for borg radios.
- Moved the translate vars to radios as well.
- The syndicate headset subtype has been removed in favor of using the
make_syndie() proc on it instead.
 2014-11-04 10:46:18 -06:00
paprka
28b1d8bef0 fixes grille rebuilding, removes damaging from tables, adds better sound effects for smashing tables, adds chance to fail breaking reinforced tables as hulk 2014-11-03 20:41:40 -08:00
GunHog
604bc648ff Gives Traitor AIs the Syndicate Channel! 
This PR is intended to support #5283 .
- Traitor AIs, when set as a traitor, will be given a new internal radio
calibrated to hear and transmit to the encrypted syndicate frequency.

Since traitors can buy a headset key for getting the Syndicate Channel,
Traitor AIs can get one too, as they cannot purchase their own TC items.
 2014-11-03 21:59:36 -06:00
hornygranny
b8f0ef4efe Merge pull request #5541 from xxalpha/cigarettes 
New Cigarette Packs
 2014-11-03 18:49:29 -08:00
hornygranny
05539c7d13 Merge pull request #5382 from TZK13/Asteroid-Toy 
Adds new meteor toys and space carp plushies to arcade machines
 2014-11-03 18:39:16 -08:00
paprka
f268f3d357 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables 2014-11-03 18:31:43 -08:00
hornygranny
e662932bd1 Merge pull request #5512 from RemieRichards/AcidBurns 
Acid Rework
 2014-11-03 18:11:49 -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
de22ca7aac Merge pull request #5354 from optimumtact/patch-1 
Remove click delay from pipe painter and adds adjacency check
 2014-11-03 17:44:29 -08:00
hornygranny
d81eb696c4 Merge pull request #5570 from xxalpha/noslipfloor 
High-traction Floor
 2014-11-03 17:37:20 -08:00
hornygranny
bf9679d6cb Merge pull request #5581 from tkdrg/spacefactory13 
Constructable conveyor belts!
 2014-11-03 17:33:32 -08:00
hornygranny
8b4ab665cb Merge pull request #5490 from tkdrg/hiasl 
Nanotransen Relay Chat
 2014-11-03 17:26:53 -08:00
hornygranny
7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings 
Soap, lube, and janitor tweaks
 2014-11-03 17:19:37 -08:00
hornygranny
6e11157661 Merge pull request #5520 from paprka/minerscrubs 
Improves mining equipment prices, rebalances medipens
 2014-11-03 17:12:02 -08:00
hornygranny
0a0cd991de Merge pull request #5516 from paprka/telestunfix 
fixes telebaton stunning borgs
 2014-11-03 17:11:39 -08:00