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
ff78a43bb7
fixes basically everything wrong with defibs right now
2014-11-04 19:33:41 -08:00
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
6efb62989f
fixes defibs reviving and noclone check
2014-11-04 15:01:22 -08:00
b77e2fc46a
Conflicts solving
2014-11-04 20:24:52 +01:00
40e093de50
Merge branch 'master' of https://github.com/tgstation/-tg-station into firefighting
2014-11-04 10:52:46 -08:00
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
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
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
b8f0ef4efe
Merge pull request #5541 from xxalpha/cigarettes
...
New Cigarette Packs
2014-11-03 18:49:29 -08:00
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
f268f3d357
Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables
2014-11-03 18:31:43 -08:00
e662932bd1
Merge pull request #5512 from RemieRichards/AcidBurns
...
Acid Rework
2014-11-03 18:11:49 -08:00
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
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
d81eb696c4
Merge pull request #5570 from xxalpha/noslipfloor
...
High-traction Floor
2014-11-03 17:37:20 -08:00
bf9679d6cb
Merge pull request #5581 from tkdrg/spacefactory13
...
Constructable conveyor belts!
2014-11-03 17:33:32 -08:00
8b4ab665cb
Merge pull request #5490 from tkdrg/hiasl
...
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
7e4688e3f6
Merge pull request #5427 from paprka/littlejanitorthings
...
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
6e11157661
Merge pull request #5520 from paprka/minerscrubs
...
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
0a0cd991de
Merge pull request #5516 from paprka/telestunfix
...
fixes telebaton stunning borgs
2014-11-03 17:11:39 -08:00
c1060d95b2
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns
...
Conflicts:
code/game/atoms.dm
code/game/objects/items.dm
2014-11-03 19:38:58 +00:00
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
ffd02c45c2
second commit for table redoing
2014-11-02 10:52:25 -08:00
51eae4c5a2
Merge pull request #5601 from phil235/ObjVerbCheckFix
...
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
71fe1bf00b
Merge pull request #5597 from phil235/IdMsgFix
...
Fix the 'show ID' message.
2014-11-02 11:10:16 -06:00
4f58312d76
Merge pull request #5596 from phil235/LipstickFix
...
Fix for #5588
2014-11-02 10:39:21 -06:00
ef29aaef57
Merge pull request #5598 from phil235/PDAsoundFix
...
Fix lack of sound when non-silent PDA receives a message.
2014-11-02 10:26:28 -06:00
85de5f7cd5
initial commit for table overhaul
2014-11-01 23:57:01 -07:00
30841b5f37
Merge remote-tracking branch 'upstream/master' into hiasl
...
Conflicts:
code/modules/research/message_server.dm
2014-11-01 20:04:26 -03:00
97a89b1162
Stun proc punctuation and compile error fix
2014-11-01 11:32:50 -07:00
17ea3d8641
adds stun to emagged defib
2014-11-01 11:28:51 -07:00
52d99e64ca
noclone check
2014-11-01 11:23:51 -07:00
6acd73c835
changes emagging, punctuation, and emag stun
2014-11-01 11:20:05 -07:00
128c9222e5
Adding checks for stun, restrained to many object verbs.
...
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
4803f099f6
Fix lack of sound when non-silent PDA receive message.
2014-11-01 15:32:48 +01:00
c8f3ad2dd0
Fix ID show message.
...
Remove "Read ID card" object verb (because all the information it gave was already in the ID card's name.
Remove some old text( ) stuff.
2014-11-01 15:17:43 +01:00
af767f2935
Fix being able to apply lipstick through masks and items covering the mouth.
2014-11-01 13:28:32 +01:00
0bc683aa29
Merge pull request #5457 from GunHog/AI_Radio
...
Adds AI Integrated Radio
2014-11-01 03:44:44 +00:00
df289b5c53
Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-10-31 10:28:57 -07:00
389e0e1237
research design and origintech update
2014-10-30 19:21:58 -07:00
b9f5947f5e
High-traction Floor
2014-10-31 01:50:31 +00:00
0296e7634a
lots of debugging, ghost notifications work now
2014-10-30 17:32:19 -07:00
0bb462e857
Fixes botcall conflicts, removes even more cruft and unused code
2014-10-30 20:36:30 -03:00
9526b8804b
Merge remote-tracking branch 'upstream/master' into attackoftheturfs
2014-10-30 19:35:03 -03:00
920739c8ab
defibrillators initial commit
2014-10-30 14:53:51 -07:00
d2982a4b8e
Adds drones, blobbernauts, magicarp, and chaos magicarp to the staff/wand of change
...
Makes it so player controlled mobs with a ranged attack can actually use said ranged attack
Fixes #5551 because it's vaguely magic related anyways
2014-10-30 14:29:06 -04:00
dfda08cc63
Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
...
Conflicts:
code/game/machinery/bots/medbot.dm
2014-10-30 06:32:13 +00:00
fa184f5487
Cuts /disease variables from 28 to 23 (includes new ones)
...
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
2014-10-30 06:21:14 +00:00
7db4f1f9a2
Fixes chat channel bugs, removes PDA authentication because apparently our players are too dumb to not share passwords between ss13 and banking accounts
2014-10-29 23:00:23 -03:00
JJRcop
paprka
tkdrg
Menshin
Ergovisavi
GunHog
hornygranny
Remie Richards
Cheridan
phil235
xxalpha
Incoming