Commit Graph

12641 Commits

Author SHA1 Message Date
mwerezak
c4e811829e Fixes #5043 2014-05-22 18:47:38 -04:00
Chinsky
f577d21f8f Merge pull request #5016 from Ccomp5950/no-undershirt
Humanoid mobs won't default to having an undershirt.
2014-05-18 05:18:20 +04:00
Ccomp5950
d41abb387f Merge pull request #5007 from mwerezak/closetfix-turf
do_after() checks both turf and loc
2014-05-17 20:02:15 -05:00
Ccomp5950
7c1d8b32d0 Humanoid mobs won't default to having an undershirt. 2014-05-17 16:01:49 -05:00
Chinsky
5b761f5207 Merge pull request #5011 from DJSnapshot/hotfix
Forgot I would need a null check.
2014-05-17 08:29:16 +04:00
DJSnapshot
56e3d0a37f Forgot I would need a null check. 2014-05-16 21:26:08 -07:00
Mike
824f9ceea8 do_after() checks both turf and loc 2014-05-16 13:13:02 -04:00
Chinsky
8d1928c117 Merge pull request #4992 from Loganbacca/closetfix
Closet wrapping fixes
2014-05-16 05:42:31 +04:00
Chinsky
ccbbde2482 Merge pull request #4997 from mwerezak/camera-alarm-fix
Fixes #4977
2014-05-16 05:38:05 +04:00
Loganbacca
78e0224649 Fixed resisting out of lockers 2014-05-15 23:03:21 +12:00
Zuhayr
ef5aaf0610 Merge pull request #4991 from Loganbacca/altfix
Alt click fix
2014-05-15 14:07:47 +09:30
Mike
c9dd123c2b Fixes #4977 2014-05-14 19:59:52 -04:00
Chinsky
5af92b2906 Merge pull request #4989 from mwerezak/disease2-runtime
Fixes #4965
2014-05-14 15:01:21 +04:00
Chinsky
98ee34a555 Merge pull request #4990 from Zuhayr/master
Fixes #4810
2014-05-14 15:00:23 +04:00
Chinsky
1c6a8c3a34 Merge pull request #4988 from mwerezak/generator-replacement
Replaces broken generator in eng hard storage
2014-05-14 14:59:24 +04:00
Loganbacca
03a01fc805 Closet wrapping fix
- Removed ability to wrap closets if you are inside them
2014-05-14 21:55:51 +12:00
Loganbacca
86190c0edb Fix resisting out of closets
- Removed do_after proc since it was hanging somewhere
2014-05-14 21:54:49 +12:00
Loganbacca
9731082e3e Added a quick adjacent check for alt-clicking
Since we really don't need to be doing a pathing check when we just want to return an object list.
2014-05-14 19:59:40 +12:00
Mike
4ceada67fd Fixes #4965 2014-05-14 01:15:01 -04:00
Mike
2d2a145907 Replaces broken generator in eng hard storage 2014-05-14 00:47:01 -04:00
Chinsky
bb33eddb63 Merge pull request #4978 from Ccomp5950/special-role-color-fix
Removes the special name coloring of those with special roles from inappropriate times.
2014-05-14 03:51:40 +04:00
Chinsky
a3340e797e Merge pull request #4980 from Loganbacca/clickfix
Invulnerable windows fix
2014-05-14 03:51:21 +04:00
Loganbacca
25983be804 Added exception for breaking full tile windows on top of single pane windows 2014-05-13 23:29:11 +12:00
Ccomp5950
76f8a94974 Removes the special name coloring of those with special roles from inappropriate times.
Basically if we don't want a privmsg link we're not going to include the font change as well.  This should fix it from displaying the coloring code in logs and other places not meant to be html (irc bot).
2014-05-12 21:27:02 -05:00
bs12-bot
1f614c3149 Merge pull request #4971 from Ravensdale/and_yeah_he_doth_spake-let_there_be_light
Fixes runtime with yellow slime extracts.
2014-05-12 19:02:31 +01:00
Ccomp5950
08687ecfde Merge pull request #4966 from Loganbacca/bayfix
Compressed matter implanter fix
2014-05-12 11:40:31 -05:00
Ravensdale
8e15a76da1 Fixes runtime with yellow slime extracts. 2014-05-12 01:15:45 -07:00
Loganbacca
f32d281132 Compressed matter implanter fix
Compressed matter implanters will now correctly remove the compressed item from the game world if it is in an inventory (player or storage container).
2014-05-11 18:30:18 +12:00
Mloc-Hibernia
1d2ce01039 mob: fix #4955
Name parameter to track wasn't sanitized correctly.

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-05-10 22:33:33 +00:00
Chinsky
963216b43b Merge pull request #4952 from Mloc/bs12-mineturfs
mining: fix for mining cooling down
2014-05-11 01:47:30 +04:00
Chinsky
799c279a86 Merge pull request #4950 from Mloc/bs12-pipefixes
Map fixes
2014-05-11 01:47:18 +04:00
Chinsky
3e52109077 Merge pull request #4949 from Zuhayr/master
Fixes.
2014-05-10 13:02:23 +04:00
Ccomp5950
69148b4dc9 Merge pull request #4953 from Loganbacca/bayfix
Ore duplication bug fix
2014-05-10 03:23:20 -05:00
Ccomp5950
4243b1ed61 Merge pull request #4943 from Intercross21/master
Special color for antagonists in logs and fix of alien whitelist
2014-05-10 03:17:15 -05:00
Loganbacca
b3af8e8936 Ore duplication bug fix
Fixes #4951
2014-05-10 14:32:08 +12:00
Zuhayr
a57ec7acdd Fixes #4810 2014-05-10 10:45:17 +09:30
Zuhayr
a68c4e9c55 Fixes #3993 2014-05-10 10:26:05 +09:30
Mloc-Argent
0911bbd0e7 mining: fix for mining cooling down
Hacky thing that was already done to space. TCMB->T0C

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-09 22:47:55 +01:00
Mloc-Argent
c9a2a4fad0 power: cables show up right on map again
Cables are red/whatever color on map again instead of white.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-09 18:53:44 +01:00
Chinsky
c9a658db0d Merge pull request #4945 from Ccomp5950/adminoops
Re-adds Show Player Panel right click menu on players.
2014-05-09 20:47:30 +04:00
Zuhayr
8d6b5e6d5c Fixes #4911 2014-05-10 01:23:29 +09:30
Zuhayr
a95dd47de3 Fixes #4744 2014-05-10 00:40:20 +09:30
Zuhayr
1dc85149ce Fixes #4716 2014-05-10 00:33:09 +09:30
Zuhayr
9f2f5fb488 Fixes #4808 2014-05-10 00:30:03 +09:30
Zuhayr
1e63e27f3b Fixes #4918 2014-05-10 00:27:18 +09:30
Loganbacca
c697b7a9b6 Null message fix
Fixes the "User places  in the glass ashtray" messages having a null object name.
2014-05-10 00:37:48 +12:00
Zuhayr
4d64af69f4 Fixes #4923 2014-05-09 21:29:44 +09:30
Ccomp5950
e4089f2fd0 Re-adds Show Player Panel right click menu on players. 2014-05-09 05:41:43 -05:00
Intercross21
1f261fdadd Fix for alien whitelist 2014-05-09 09:20:55 +04:00
Chinsky
5426670a3d Merge pull request #4938 from Ccomp5950/banned_strikethrough
Jobs you can't select are struckthrough instead of just being red.
2014-05-08 13:26:37 +04:00