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
590684e129
Merge branch 'master' of https://github.com/tgstation/-tg-station into beekeepermodewhen
...
Conflicts:
icons/mob/animal.dmi
tgstation.dme
2014-11-09 00:15:12 +11:00
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
53bf024dbe
Merge pull request #5545 from RemieRichards/DiseaseRework
...
Disease Code Partial Rework
2014-11-08 00:17:47 -06:00
15b16e1f67
Merge pull request #5726 from paprka/traitorbeltthing
...
Adds disguised med analyzer to medibelts
2014-11-07 23:39:56 -06:00
efb3877fcf
Merge pull request #5682 from paprka/fixdefib
...
Defibrillator Hotfixes
2014-11-07 19:49:04 -08:00
3854ab4763
Merge pull request #5707 from Donkie/closetbudgefix
...
Fixed #3752 It won't budge!!!11
2014-11-07 20:08:38 -06:00
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
7bde69c3a7
emagged defibs now make people gasp
2014-11-07 16:17:58 -08:00
774e82de06
Buffed weaken of safety off defibs and removed burn damage
2014-11-07 16:17:11 -08:00
9e487bb33a
derp
2014-11-07 22:38:52 +01:00
c8ffcf51ae
lattice and grille deconstruction refactor
2014-11-07 13:36:28 -08:00
594fd9d3e2
Merge pull request #5271 from Menshin/html_sanitization
...
Text input sanitization (take 1)
2014-11-07 13:56:20 -06:00
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
0914b1a7cd
Merge pull request #5642 from phil235/AttackAnimation
...
Adding an attack animation to most attacks
2014-11-07 18:39:27 +00:00
e2bf3eca4b
Merge pull request #5705 from Donkie/batonfix
...
Fixes #5691 - Batons incorrectly giving messages
2014-11-07 10:27:09 -06:00
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
669a20df77
Merge pull request #5708 from paprka/stupidfuckup
...
Fixes utility medipen bundle for miners
2014-11-07 10:03:46 -06:00
bc5754b378
adding diagonal attack animation.
2014-11-07 15:42:07 +01:00
7ca1c48206
Fix the tape recorder.
2014-11-07 10:52:52 +01:00
e5db75d756
adds disguised med analyzer to medibelts
2014-11-06 21:36:54 -08:00
d76e4f62e5
added deconstructing
2014-11-06 18:01:19 -08:00
2a3098d5a8
Fix
2014-11-07 00:39:19 +01:00
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
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
09e6825b5d
Merge pull request #5692 from Aranclanos/TKihateyou
...
Computers and telekinesis fix
2014-11-06 21:56:31 +00:00
e1a06faa9b
Increases gold content per Robust Gold cigarette to 1
2014-11-06 18:23:48 +00:00
b99499e277
fixes utility medipen bundle for miners
2014-11-05 18:02:14 -08:00
13d955ed47
Fixed #3752
2014-11-06 01:55:57 +01:00
059244387f
Fixed #5691
2014-11-06 01:12:15 +01:00
d1e0ef943c
Changes messages to be more appropriate for last commit + more fluffy.
2014-11-05 23:31:51 +00:00
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
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
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
63a8a900dc
Removes loc check
2014-11-05 22:48:53 +11:00
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
48ad48acce
Add a fail message to unbuckling, breaking out of cuffs and closets and performing CPR.
2014-11-04 20:30:04 +01: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
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
4d7d8fa423
derp...
2014-11-04 18:42:03 +01:00
1eaaf35b41
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1
...
Conflicts:
code/game/objects/objs.dm
code/modules/mob/living/carbon/human/human_defense.dm
2014-11-04 18:24:52 +01: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
5720b29130
final commit for now for glass tables
2014-11-03 19:26:33 -08:00
b8f0ef4efe
Merge pull request #5541 from xxalpha/cigarettes
...
New Cigarette Packs
2014-11-03 18:49:29 -08:00
Menshin
Jordie0608
Ergovisavi
Cheridan
hornygranny
Remie Richards
paprka
phil235
xxalpha
Daniel
Aranclanos
JJRcop
tkdrg
GunHog