Commit Graph

17742 Commits

Author SHA1 Message Date
GinjaNinja32
2e2cb07ba7 Fixes... things. Lots of things. 2015-05-07 15:32:16 +01:00
Chinsky
e0a903d9eb Merge pull request #9093 from Baystation12/master
Master->Freeze
2015-05-05 01:42:57 +03:00
Ccomp5950
4a7d970bce Merge pull request #9090 from Kelenius/ofLogsAndTypos
Fixes a few log-destroying lines
2015-05-04 15:30:13 -04:00
PsiOmegaDelta
d1227bdec5 Merge pull request #9087 from volas/cinematic2
Modification to 'cinematic' command
2015-05-04 20:55:08 +02:00
Kelenius
33dde892e2 Fixes a few log-destroying lines 2015-05-04 21:33:30 +03:00
Chinsky
587015ff4e Merge pull request #9086 from RavingManiac/master
Intent menu appears on zoom
2015-05-04 21:24:06 +03:00
PsiOmegaDelta
d86dd60c63 Merge pull request #9064 from Loganbacca/smokeFix
Chem smoke fadeOut sanity checks
2015-05-04 14:52:33 +02:00
volas
7ff68f8757 Modification to 'cinematic' command 2015-05-04 12:10:59 +03:00
RavingManiac
6123c8421e Intent menu appears on zoom 2015-05-04 16:58:24 +10:00
Chinsky
d5495870d1 Merge pull request #9045 from mwerezak/resist
Resist code cleanup, plus fixes
2015-05-02 08:22:51 +03:00
Chinsky
144c1eb321 Merge pull request #9033 from mwerezak/zas-fix
Fixes #8987, lost edges from merged zones
2015-05-02 08:21:53 +03:00
Loganbacca
6238dabf88 Chem smoke fadeOut sanity checks
Ported updates from /tg/ to fadeOut code. Updates written by vista-
2015-05-02 13:33:25 +12:00
mwerezak
b10c64d48b Adds a closet breakout animation, fixes spamming the breakout proc 2015-05-01 16:19:52 -04:00
mwerezak
3509178aa8 More resist refactoring
Reorganizes resist a bit more to allow for cleaner inheritance.
2015-05-01 15:13:07 -04: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
mwerezak
98a4f54b88 Adds span classes, moves secure closet procs 2015-05-01 01:23:53 -04:00
mwerezak
cd707d8279 Resist verb cleanup
Fixes #8922 and cleans up resisting.
Moves various code pieces to new procs, subtypes, or other objects where
appropriate.
2015-05-01 01:23:26 -04:00
mwerezak
03e88ca9a5 Updates locate(/obj/machinery/door/airlock) hack 2015-04-29 20:53:50 -04:00
mwerezak
a80cb1b44e Fixes edges being lost when zones are merged 2015-04-29 20:27:39 -04:00
mwerezak
277103f1cd Fixes tiny door zones
Fixes #8987 by deferring the update of self-zone-blocked turfs until after non-self-zone-block turfs have updated (and thus have valid zones).
2015-04-29 13:01:26 -04:00
Yoshax
2c4783386f Removes CE's hardhat 2015-04-29 16:11:53 +01:00
mwerezak
fbede7a193 Minor ZAS-related cleanup 2015-04-28 23:00:56 -04:00
Yoshax
e5cd8c7adb Fixes jacket 2015-04-28 20:40:16 +01:00
Yoshax
6c8bc809c6 Adds more items to custom loadout 2015-04-28 20:37:57 +01:00
PsiOmegaDelta
bb7cd10cbb Merge pull request #8984 from volas/master
Fixes #8913
2015-04-28 07:53:45 +02:00
PsiOmegaDelta
1e457f6e34 Merge pull request #9009 from Yoshax/icanintosurgery
Fixes antag surgery kit
2015-04-28 07:35:58 +02:00
Chinsky
6fb3446af3 Merge pull request #9000 from RavingManiac/master
Candle tweak
2015-04-28 06:26:44 +03:00
Chinsky
0ff3d9af99 Merge pull request #9005 from mwerezak/master-fixes
Fixes (master)
2015-04-28 06:26:32 +03:00
volas
59e17f7a9b small fix 2015-04-28 00:41:14 +03:00
mwerezak
36d9944dfd Fixes #8977 2015-04-27 14:55:18 -04:00
mwerezak
d0615430ec Fixes #8997
Gibbing a human now causes all items on or in their person to get thrown around.
This includes implants and bullet shrapnel.
2015-04-27 14:48:55 -04:00
Yoshax
aa115f5bb2 Fixes antag surgery kit 2015-04-27 16:41:47 +01:00
Kelenius
159ad76fab Fixes #8998 2015-04-27 08:06:21 +03:00
RavingManiac
89a72fb326 Candle burn time increased to ~30 minutes
Some fluff added to candle description explaining how they burn in space
2015-04-27 12:10:54 +10:00
Chinsky
75ffb05c5b Merge pull request #8981 from DeeUnderscore/cell-charger-fix
Fix cell charger icon not updating when cell taken out by a borg
2015-04-26 20:05:49 +03:00
Daranz
dd02f9e9f0 Fix cell charger icon not updating when cell taken out by a borg 2015-04-25 19:38:47 -04:00
Chinsky
3e3b772a13 Merge pull request #8926 from Yoshax/loadoutpoints
Adjusts custom loadout item prices.
2015-04-26 00:48:39 +03:00
Chinsky
f48b9be16b Merge pull request #8974 from mwerezak/balaclava
Fixes balaclava sprite sheets
2015-04-26 00:46:06 +03:00
volas
53a95d8eff Fixes #8913 2015-04-25 22:43:50 +03:00
mwerezak
4d9586ecae Fixes balaclava sprite sheets 2015-04-25 02:55:04 -04:00
Zuhayr
24175051a2 Merge pull request #8961 from mwerezak/limb-augments
Fixes Snapwalk's Limb Augment item being removable through the inventory panel
2015-04-24 16:15:16 +09:30
mwerezak
0a7fd34f3f Limb augments no longer prevent putting on jumpsuits 2015-04-23 11:27:16 -04:00
mwerezak
7a6a54b671 Fixes Snapwalk's Limb Augment item being removable through the inventory panel
I haven't heard of any issues on the server about this, but it's probably best to prevent them from being removed.
2015-04-23 08:25:49 -04:00
PsiOmega
2aa9a70496 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-23 12:59:47 +02:00
Zuhayr
3fc9260187 Merge pull request #8954 from GinjaNinja32/diona_speech
Fixes dionaea always using the verb "says".
2015-04-23 17:02:20 +09:30
GinjaNinja32
07cc28af8e Fixes dionaea always using the verb "says".
Not sure why, but speech_problem_flag is being set to 1 for dionaea, and only dionaea.
Fixes #8952
2015-04-23 08:03:07 +01:00
Chinsky
392cc1b0bb Merge pull request #8938 from GinjaNinja32/floorpainter
Fixes floor painter white-bot and white-delivery states
2015-04-23 09:20:13 +03:00
Chinsky
df21e9fc2e Merge pull request #8921 from PsiOmegaDelta/DirtyEngineers
Shower curtains no longer lose their default color upon being washed.
2015-04-23 07:34:44 +03:00
Yoshax
a2cf2a4d1a Adjusts custom item loadout costs to be more balanced and standardises costs, standard cosmetics are 1 point, items with uses/armor/storage are 2 points. 2015-04-22 16:19:59 +01:00