Commit Graph

11487 Commits

Author SHA1 Message Date
Zuhayr
aa2e25928d Fixes a runtime with organ Destroy() called with nonhuman owner. 2015-06-22 22:03:24 +09:30
PsiOmega
60f6a2ea10 Fixes antags being able to see the appearance changer.
Sets invisibility level to MAXIMUM.
2015-06-21 21:12:28 +02:00
GinjaNinja32
e3cf4692b5 Merge pull request #9879 from PsiOmegaDelta/150621-BoldChanges
Fixes the Changelog menu button.
2015-06-21 13:16:18 +01:00
PsiOmegaDelta
1a6ea56194 Fixes the Changelog menu button.
It had lost the ability to go bold upon detected unread changelog entries.
2015-06-21 13:39:26 +02:00
GinjaNinja32
7f319f528a Merge pull request #9875 from Zuhayr/dev-freeze
Antag system fixes
2015-06-21 12:07:50 +01:00
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta
3d572ccc27 Merge pull request #9874 from mwerezak/fixes
Dev-freeze Fixes
2015-06-21 09:04:08 +02:00
PsiOmegaDelta
9426d0844c Merge pull request #9872 from mwerezak/earslot
Fixes #9514
2015-06-21 09:03:00 +02:00
mwerezak
80c80abe3a Fixes #9511 2015-06-21 03:00:37 -04:00
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
PsiOmegaDelta
4a5da7221c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/resist.dm
2015-06-20 20:24:05 +02:00
PsiOmegaDelta
33dc2e5811 Merge pull request #9867 from Zuhayr/dev-freeze
More fixes
2015-06-20 19:05:32 +02:00
Zuhayr
6fff0069db Fixes # #8327 2015-06-21 01:48:15 +09:30
Zuhayr
7c1696c3c8 Fixes #9435 2015-06-21 01:27:23 +09:30
Zuhayr
f371da4ae9 Merge pull request #9838 from mwerezak/stunrevolver
Assorted small dev-freeze tweaks, stunrevolver fix
2015-06-21 01:16:58 +09:30
Zuhayr
7d9378748d Comments out fire and rads for material objects since they are very imbalanced atm. 2015-06-20 22:48:08 +09:30
Zuhayr
56b68b9abe Fixes #9847 2015-06-20 22:15:38 +09:30
Zuhayr
e13c4a2243 Fixes #7828 2015-06-20 21:57:03 +09:30
Zuhayr
7d710f2019 Fixes #8471 2015-06-20 21:54:22 +09:30
Chinsky
45e0f1b233 Merge pull request #9859 from mwerezak/bucklefix
Fixes #9624
2015-06-20 01:00:48 +03:00
PsiOmegaDelta
f5da9f70c5 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	config/example/config.txt
2015-06-19 09:55:48 +02:00
HarpyEagle
ccb12556d6 Fixes #9624 2015-06-18 16:31:29 -04:00
Ccomp5950
eea423ce0f Merge pull request #9857 from GinjaNinja32/bot
Adds support for bots which use world.Export() for server-to-bot communication
2015-06-18 13:46:50 -04:00
Ccomp5950
7ee7cafbff Merge pull request #9846 from GinjaNinja32/irc
Allows setting the URL for the IRC bot to report separately from the main SERVER config setting
2015-06-18 13:46:32 -04:00
GinjaNinja32
8d232e9304 Adds support for bots which use world.Export() for server-to-bot communication 2015-06-18 18:34:55 +01:00
HarpyEagle
44644d34b4 Restores stop drop and roll time
Returns the duration of stop drop and roll to 3 seconds. The amount of
removed fire stacks was reduced by ~3/5 instead of lengthening the time.
2015-06-18 12:55:31 -04:00
HarpyEagle
5c1499ff1f Merge remote-tracking branch 'upstream/dev-freeze' into stunrevolver 2015-06-18 12:54:43 -04:00
HarpyEagle
4b441bc293 Adjusts animate_tail_once duration 2015-06-18 12:53:20 -04:00
HarpyEagle
b26edd690c Certain sidearms now use the lighter gunshot sound 2015-06-17 09:59:40 -04:00
HarpyEagle
1ba777f670 Reverses stunrevolver buff 2015-06-17 09:59:39 -04:00
GinjaNinja32
078cfb2533 Merge pull request #9774 from mwerezak/chem-touch
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
GinjaNinja32
a60b91fd1b Adds a new configuration value, SERVERURL, for the IRC bot to use if set 2015-06-17 10:00:35 +01:00
Zuhayr
031c7db3e5 Merge pull request #9821 from mwerezak/tableshaveturned
Makes standard tables plastic, related changes
2015-06-17 14:35:22 +09:30
mwerezak
73333ac9c8 Moves metabolism to a holder subtype 2015-06-16 16:26:06 -04:00
mwerezak
70433b4367 Makes showers wash away touching reagents
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
2015-06-16 16:26:04 -04:00
mwerezak
4cb70b2b94 Ingesting diseased blood contracts the disease
Only if the disease is a contact type disease. The same restriction is
also applied to touching diseased blood.
2015-06-16 16:26:02 -04:00
PsiOmegaDelta
37f59551fc Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/modules/reagents/reagent_containers/glass.dm
2015-06-16 10:30:50 +02:00
PsiOmegaDelta
93c3d03801 Merge pull request #9817 from GinjaNinja32/records
'Fixes' NanoUI locking up on medical/security records
2015-06-15 15:30:08 +02:00
GinjaNinja32
0423691ca2 Missed a span 2015-06-15 12:20:16 +01:00
GinjaNinja32
4da75dba68 Fixes some more unbalanced HTML 2015-06-15 10:48:30 +01:00
mwerezak
637306eb14 Adds holographic plastic 2015-06-14 22:18:11 -04:00
mwerezak
eb0f1fa69e Makes R-walls double plasteel
Makes R-walls double plasteel like on master, adjusts plasteel integrity
so that R-walls have the same health as on master as well.
2015-06-14 15:33:48 -04:00
mwerezak
0d6dfd899a Makes standard tables plastic
Makes standard tables plastic, readds steel tables to various places,
mainly around engineering and maintenance. Makes shuttle tables
reinforced.
2015-06-14 13:38:56 -04:00
GinjaNinja32
3c525e907a 'Fixes' NanoUI locking up on medical/security records 2015-06-14 14:44:38 +01:00
PsiOmega
9d90691605 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
2015-06-14 10:35:29 +02:00
mwerezak
ad24805eb8 Mob fire temperature fix, tweaks
Mob fires are now guaranteed to burn at least as hot as a cold flame -
no more merely warming mobs up slightly with low fire stacks.

Also made mob fires burn hotter overall and resisting slower.
2015-06-13 15:45:52 -04:00
GinjaNinja32
8d0c7039df Changes to dsay
- Adds dsay to list of +DEBUG verbs
- Changes dsay to use holder rank rather than trying to guess from rights
2015-06-13 16:46:03 +01:00
PsiOmega
d989df7e8c Adds the Jump-To-X verbs to the list of debug verbs. 2015-06-13 09:53:32 +02:00
PsiOmega
c2f8e1242e Expands admin jump permissions, cuts down on superfluous feedback. 2015-06-13 08:44:58 +02:00