Commit Graph

1039 Commits

Author SHA1 Message Date
PsiOmegaDelta
cd264fb558 Merge pull request #9160 from GinjaNinja32/acting_manifest
Acting jobs now sort with non-acting jobs on the manifest.
2015-05-10 10:10:13 +02:00
Yoshax
8f9fd29c5f Removes sleeping chems from clones and adds a consistent sleep period (+1 squashed commits)
Squashed commits:

[2c002f9] Removes sleepy chems from cloning
2015-05-09 20:08:19 +01:00
Yoshax
6c121d232b Makes bear traps do damage when stepped on 2015-05-09 19:57:01 +01:00
Techhead0
95aef467a0 Magboots can be worn over shoes
Equipping magboots or a voidsuit with magboots installed will place them
over any existing shoes. Existing shoes are replaced on feet when magboots
are unequipped. Magboots cannot be worn over other magboots.
Fixes #9125
Changelog for this and my previous voidsuit changes included.
2015-05-09 14:20:03 -04:00
GinjaNinja32
75b5cf0b1e Acting jobs now sort with non-acting jobs on the manifest. 2015-05-09 15:36:04 +01:00
PsiOmega
1c6785aa84 Updates changelog. 2015-05-09 11:13:31 +02:00
Yoshax
8b7dc5d257 Maps in practice shells to the armory. 2015-05-08 02:38:24 +01:00
PsiOmega
420a16c9ab Changelog entry. 2015-05-07 09:55:36 +02:00
PsiOmega
a311658c39 Updates changelog. 2015-05-07 08:52:35 +02:00
PsiOmega
9e4dacc765 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/machinery/machinery.dm
	code/game/objects/items/weapons/storage/misc.dm
	code/game/response_team.dm
	html/changelogs/HarpyEagle-NeckgrabFix.yml
2015-05-07 08:14:57 +02:00
Ccomp5950
70fc66da29 Merge pull request #9127 from mwerezak/resist
Updates changelog
2015-05-06 20:55:46 -04:00
mwerezak
d987222de7 Updates changelog 2015-05-06 20:52:45 -04:00
Zuhayr
7389ec379f Merge pull request #9112 from PsiOmegaDelta/SenseMe
Adds stretches of power cable around the construction outpost.
2015-05-07 09:30:17 +09:00
Ccomp5950
143bde9774 Merge pull request #9111 from PsiOmegaDelta/AreaContentsConcat
Cloning vats and DNA scanners are again located by cloning computers.
2015-05-06 17:31:19 -04:00
Chinsky
d0c2b883aa Merge pull request #9069 from RavingManiac/dev
Muzzle-flash lighting effect for guns
2015-05-06 17:27:21 +03:00
PsiOmega
31a7f6310b Changelog entry. 2015-05-06 15:24:56 +02:00
PsiOmega
1d20fa5941 Changelog generation. 2015-05-06 12:26:35 +02:00
PsiOmega
f867b4a2c3 Changelog entry. 2015-05-06 11:25:14 +02:00
PsiOmega
154b69f4a5 Map tweaks now have their own changelog icon.
Icon acquired from http://p.yusukekamiyamane.com/.
2015-05-06 11:24:35 +02:00
PsiOmega
efe2568a68 Changelog entry. 2015-05-06 09:27:24 +02:00
PsiOmega
7022cc1a7d Changelog entry. 2015-05-05 09:05:23 +02:00
PsiOmega
65badb6a3e Changelog update. 2015-05-05 08:14:02 +02:00
PsiOmega
151c5204ee Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml
2015-05-05 08:11:28 +02:00
Chinsky
e0a903d9eb Merge pull request #9093 from Baystation12/master
Master->Freeze
2015-05-05 01:42:57 +03:00
PsiOmega
1edb39b556 Merge remote-tracking branch 'upstream/dev' into BrokenGrills 2015-05-04 14:58:24 +02:00
RavingManiac
a35f2c0ad6 Changelog update 2015-05-04 17:03:37 +10:00
RavingManiac
f1ccb3ee6e Muzzle-flash lighting effect for guns
Energy guns now display shots remaining on examine
2015-05-03 12:19:11 +10:00
PsiOmega
d068b57388 Changelog update. 2015-05-02 21:55:13 +02:00
PsiOmega
3866fda394 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/ZAS/Turf.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/recycling/sortingmachinery.dm
2015-05-02 21:50:11 +02:00
PsiOmega
632ef4dd86 Changelog entry. 2015-05-02 21:38:06 +02:00
Chinsky
d5495870d1 Merge pull request #9045 from mwerezak/resist
Resist code cleanup, plus fixes
2015-05-02 08:22:51 +03:00
Chinsky
aeda1db3c5 Merge pull request #9041 from PsiOmegaDelta/ChitterChitter
Fixes #9029.
2015-05-02 08:22:09 +03:00
Chinsky
8f1a9a9375 Merge pull request #9040 from PsiOmegaDelta/LOOCToggle
Admins can now toggle OOC and LOOC separately from each other.
2015-05-02 08:21:50 +03:00
PsiOmega
b34e44ab84 Mice are now numbered.
You are not a man. This should also make things easier for admins.
2015-05-01 08:54:05 +02:00
mwerezak
8b32d2356e Fixes #9044
Apparently stunned ticks down after grabs are updated.
2015-05-01 02:09:43 -04:00
PsiOmega
a49e6035a9 Fixes #9029.
Reduces the announcement message delay for spiders from 800-900 seconds to 180-300 seconds.
Number of spiders now based on severity, with a moderate level event spawning as many spiders as before.
2015-04-30 10:22:58 +02:00
PsiOmega
82a8f32783 Admins can now toggle LOOC separately from OOC.
Also includes what I image to be proper permission checks for toggling the various OOC channels.
2015-04-30 09:52:29 +02:00
Chinsky
46a3b6579c Merge pull request #9030 from Yoshax/changelog
Adds changelog entry for previous emergency message changes
2015-04-30 10:31:15 +03:00
PsiOmega
c01f115c57 Updates changelog. 2015-04-30 08:10:59 +02:00
PsiOmega
f72fe0d194 Merge remote-tracking branch 'upstream/master' into dev 2015-04-30 08:09:25 +02:00
Yoshax
2c5d981e57 Adds changelog entry for previous changes 2015-04-29 18:56:36 +01:00
PsiOmega
ac73a23bf2 Corrects AGPL link text (target link was correct however). 2015-04-29 14:41:57 +02:00
PsiOmega
493552d68e Updating the changelog. 2015-04-29 14:36:24 +02:00
Chinsky
34bbe33030 Merge pull request #8993 from PsiOmegaDelta/PortableNanoUI
Portable atmospheric pump/scrubbers now use NanoUI.
2015-04-29 09:43:47 +03:00
Yoshax
6c8bc809c6 Adds more items to custom loadout 2015-04-28 20:37:57 +01:00
PsiOmegaDelta
851d5423f3 Merge pull request #8971 from mwerezak/burst-fire
Gun firemode system, burst firing
2015-04-28 20:24:03 +02:00
Zuhayr
cc19bbb604 Merge pull request #8972 from DeeUnderscore/paper-functionality
Paper functionality additions
2015-04-29 02:46:21 +09:30
Chinsky
04b994f939 Merge pull request #9008 from PsiOmegaDelta/CameraPoff
Adds the APC & camera damage events.
2015-04-28 13:49:50 +03:00
PsiOmega
74675f5a14 Updates changelog. 2015-04-28 08:48:48 +02:00
PsiOmega
f760d44127 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00