44cc6c6d97
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-14 03:07:13 +03:00
c104ad6cd4
Merge pull request #6323 from AndroidSFV/fix6313
...
Fixes 6313
2014-12-12 23:01:43 -06:00
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
8d110ee496
Tiny clean up, still lots of work to do
...
Only compiletested, these changes were never tested in the game yet
2014-12-12 23:57:11 +03:00
3a0927febd
Fixes 6313
2014-12-12 11:16:54 -06:00
11f6c7c401
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-12 04:51:16 +03:00
0921aa201f
Added datum mutations
...
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
98a865298a
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/mecha/mech_fabricator.dm
2014-12-11 13:53:37 -08:00
947074d085
Adds the handheld crew monitor.
2014-12-09 19:42:54 -05:00
af3f1aa4d8
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/machinery/deployable.dm
code/game/objects/items/weapons/storage/lockbox.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/modules/clothing/glasses/hud.dm
code/modules/mob/living/silicon/robot/robot.dm
2014-12-09 16:03:45 -08:00
41f0d0e04f
Fix flash messages when failing to flash
...
It would give the success message when flashing carbons even if the flash
had actually failed to work
2014-12-09 09:38:26 +13:00
da35b4dadc
Merge pull request #6115 from CorruptComputer/pdashitstorm
...
Added a cancel button to the PDA
2014-11-28 20:52:38 +03:00
d2848e5f95
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-28 00:32:30 +03:00
058e342e95
Added a cancel button to the PDA
2014-11-27 14:27:00 -06:00
275d7fdd77
Merge pull request #6038 from paprka/hatfix
...
fixes head of security and warden hat flashbang confusion
2014-11-27 17:14:51 +03:00
c5209f2399
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-27 15:30:37 +03:00
882e868e7b
Fixed runtime and added syndie headset protection
2014-11-24 21:54:09 -08:00
a24eeb7f93
Merge pull request #5758 from phil235/TorchFix
...
Fixes the torch and flare icons.
2014-11-24 15:18:08 -08:00
6d86949742
removes flashbang protection from hats, gives it to bowman headsets
2014-11-24 05:55:13 -08:00
84e69cff6b
Conflict resolve
...
Damn cables
2014-11-24 12:27:53 +03:00
3511e0dada
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
...
Conflicts:
code/game/turfs/simulated/walls.dm
Ye somth liek dat
2014-11-23 17:46:14 +03:00
0bc84e120e
Merge branch 'master' of https://github.com/tgstation/-tg-station into TorchFix
...
Conflicts:
icons/mob/items_lefthand.dmi
Adding PR 5829 to my PR so both can be merged now.
2014-11-22 18:56:31 +01:00
d6c2cb4df5
Fix the traitor health analyzer (radiation laser) making the attack animation and hitsound when used on target. Changing one span class and removing one text() stuff.
2014-11-22 17:36:02 +01:00
a9199118e5
Merge pull request #5925 from paprka/flashfix
...
Fixes flashes being useless
2014-11-21 10:14:39 -06:00
41c86dd557
fixes disarming affecting area stuns
2014-11-21 08:06:07 -08:00
678a13c451
moves emag effects from attackby() into atom proc emag_act()
2014-11-20 17:49:06 -08:00
afac70c4f7
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-19 21:37:06 +03:00
b071a0167e
Made explosions work in a slightly different way
...
Yep
2014-11-18 16:22:41 +03:00
649be7cf8a
Fixes flashes being useless
2014-11-16 14:39:50 -08:00
ec944abfc6
* limit atmos/fire alerts to the current z_level
...
* atmos/fire alerts are now linked to an object and not its area, as intended
* simplified and full pathed the radio frequency datum
* made radio objects properly clean on del/qdel, instead of letting the radio controller remove nulls at each post_signal()
2014-11-14 10:10:45 +01:00
a248a1a4db
Conflicts:
...
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-11-13 17:33:32 +01:00
606bd332d3
fixed broken commits
2014-11-12 17:54:08 -08:00
8e419ca8f9
possible fix
2014-11-12 17:48:54 -08:00
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
4ff8507c85
Merge pull request #5727 from phil235/RecorderFix
...
Fixes the tape recorder. (one typo)
2014-11-08 15:07:47 -08:00
8f855bf49a
Fixes the torch and flare icons, especially the "on" inhand icons.
2014-11-08 16:14:19 +01: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
7ca1c48206
Fix the tape recorder.
2014-11-07 10:52:52 +01: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
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
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
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
8b4ab665cb
Merge pull request #5490 from tkdrg/hiasl
...
Nanotransen Relay Chat
2014-11-03 17:26:53 -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
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
30841b5f37
Merge remote-tracking branch 'upstream/master' into hiasl
...
Conflicts:
code/modules/research/message_server.dm
2014-11-01 20:04:26 -03: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
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
Razharas
Cheridan
tkdrg
AndroidSFV
Hornygranny
Xhuis
oranges
Razharas
CorruptComputer
paprka
phil235
Menshin
Intigracy
GunHog
Remie Richards