Chinsky
f322a6af5e
Merge pull request #6992 from PsiOmegaDelta/BodyBag
...
Shapely body bags.
2014-11-12 23:45:36 +03:00
Chinsky
dab47ad163
Merge pull request #6978 from PsiOmegaDelta/SlugsInMyBrain
...
Borers can now cancel out from injecting chemicals.
2014-11-12 23:45:23 +03:00
Chinsky
b964526aa2
Merge pull request #6980 from MagmaRam/drinks
...
Some new drinking glass icons
2014-11-12 23:45:07 +03:00
Chinsky
9e818ef52f
Merge pull request #6983 from PsiOmegaDelta/Event
...
Event Manager Control
2014-11-12 23:45:02 +03:00
Chinsky
9903cfd15f
Merge pull request #6986 from MrSnapwalk/springinyourstep
...
Adds Bromuzl's custom item.
2014-11-12 23:44:54 +03:00
Chinsky
70f808a8c9
Merge pull request #6991 from PsiOmegaDelta/SafeInMyCloset
...
No more sleeping in closets
2014-11-12 23:44:35 +03:00
PsiOmega
7bb5b51954
Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event
...
Conflicts:
code/modules/events/event_manager.dm
2014-11-12 10:18:45 +01:00
PsiOmega
ddc1a617d0
Fixes and event end estimations.
2014-11-12 09:39:54 +01:00
PsiOmega
e6a9e08886
Shapely body bags.
...
Body bags containing bodies now uses a previously unused icon_state with a more defined humanoid shape.
2014-11-11 11:44:33 +01:00
PsiOmega
0f47a615e3
No more sleeping in closets
...
Removes the 2-tick sleep cause by every closet in New().
Moves the code that sucks up items into closets to initialize() to avoid processing still null objects.
2014-11-11 11:07:05 +01:00
Atlantiscze
0a783651a8
Second fix attempt
2014-11-11 08:10:01 +01:00
MrSnapwalk
0ff612aea6
Adds Bromuzl's custom item to item_defines.dm.
2014-11-10 19:51:08 -06:00
PsiOmega
0602200dd6
Round-end report.
2014-11-10 19:20:16 +01:00
PsiOmega
ee75aa1fa4
Logging of event changes.
2014-11-10 16:19:51 +01:00
PsiOmega
d4368954dc
Event Manager Control
...
Admins can now:
Pause event start countdown.
Add/Remove events to rotation.
Affect the likelihood of events occurring.
Allow one shot events to fire again.
2014-11-10 15:04:31 +01:00
Zuhayr
e80d294aa5
Compile issues with the merge. PDA tapping may be broken for pAIs.
2014-11-10 13:17:17 +10:30
Zuhayr
b4ea25d064
Merge conflict resolution.
2014-11-10 13:00:06 +10:30
MagmaRam
08c87edd46
Changed glass to cup for tea and coffee to make the sprites more consistent.
2014-11-09 20:00:17 -05:00
MagmaRam
4815bba8fb
Adds sprites for lemon-lime soda, grape soda in a glass, and coffee.
2014-11-09 19:45:53 -05:00
PsiOmega
24be641f5b
Borers can now cancel out from injecting chemicals.
2014-11-09 20:54:41 +01:00
Chinsky
c481bd151d
Merge pull request #6970 from PsiOmegaDelta/MapityMap
...
Medbay Splitup
2014-11-09 21:38:44 +03:00
Chinsky
6b0049391f
Merge pull request #6922 from PsiOmegaDelta/TheGreatEvents
...
Random Event Overhaul
2014-11-09 00:02:13 +03:00
Chinsky
82e5cf4b72
Merge pull request #6965 from PsiOmegaDelta/Supply
...
Service personnel radio frequency
2014-11-09 00:02:07 +03:00
Chinsky
57110b4059
Merge pull request #6961 from GinjaNinja32/phoronspecial
...
Fixes Toxins Special having no sprite
2014-11-09 00:00:59 +03:00
PsiOmega
7809b7143a
Medbay Areas
...
Breaks the medbay hallway down into smaller areas.
Reduces the headache caused by breaches.
2014-11-08 21:51:23 +01:00
PsiOmega
574a8f5570
Completes the basic random event manager.
2014-11-08 18:22:31 +01:00
PsiOmega
bd885164f1
Merge remote-tracking branch 'upstream/dev' into TheGreatEvents
...
Conflicts:
code/global.dm
2014-11-08 10:26:45 +01:00
Chinsky
79a5170325
Merge pull request #6959 from PsiOmegaDelta/StateLaws
...
AI fixes
2014-11-08 11:11:04 +03:00
Chinsky
90cb5f5363
Merge pull request #6962 from GinjaNinja32/drinks
...
Move glass appearance into reagent datums
2014-11-08 11:10:48 +03:00
Chinsky
4230a20c45
Merge pull request #6963 from mwerezak/sliceable
...
Rewrites food slicing, energy weapons
2014-11-08 11:07:34 +03:00
PsiOmega
4ecc058150
Service personnel get their own radio frequency
...
Bartenders, chefs, and janitors now have their own service frequency and corresponding headset.
The HoP is listening to this channel by default.
Creates a proper locker for the chef's extra gear.
2014-11-07 20:54:57 +01:00
PsiOmega
04661c0240
AI and Topic fixes.
...
Adjusts the AI integrity status, no longer should it report being alive until -100%
Moves the Topic() nowindow check down to the very bottom of /obj/.
2014-11-07 11:10:32 +01:00
PsiOmega
f412eb8e1d
Merge remote-tracking branch 'upstream/dev' into StateLaws
2014-11-07 09:42:53 +01:00
Ccomp5950
28635e3f8f
Merge pull request #6958 from PsiOmegaDelta/TimeOfNews
...
Newscaster and photo cleanup
2014-11-07 01:00:18 -05:00
Ccomp5950
a9f63a2094
Merge pull request #6948 from atlantiscze/power-related-multifix
...
[Ready To Merge] Power Multifix
2014-11-07 00:59:52 -05:00
mwerezak
cc82a47163
Cleans up food slicing
2014-11-07 00:10:49 -05:00
mwerezak
81f8f36874
Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.
2014-11-06 19:50:40 -05:00
Chinsky
13430bd48f
Merge pull request #6956 from mwerezak/logo
...
Fixes #6941
2014-11-07 03:50:08 +03:00
Chinsky
42e2409408
Merge pull request #6942 from PsiOmegaDelta/Hacking
...
Wiring Upgrade
2014-11-07 03:49:38 +03:00
Chinsky
5f3f1c64eb
Merge pull request #6946 from TwistedAkai/dev
...
Add Window Dismantling
2014-11-07 03:49:01 +03:00
Chinsky
df5912eccd
Merge pull request #6943 from PsiOmegaDelta/Ghosts
...
Manifest ghost visibility-toggle
2014-11-07 03:46:22 +03:00
Chinsky
4c027495a3
Merge pull request #6953 from GinjaNinja32/laptopvendor
...
Fixes newly-vended laptops opening windows and giving close messages
2014-11-07 03:46:12 +03:00
Chinsky
4884fe2ba8
Merge pull request #6947 from mwerezak/pipe-cap
...
Fixes #6299 , Again
2014-11-07 03:45:56 +03:00
Chinsky
52cd8649f6
Merge pull request #6949 from PsiOmegaDelta/Runtime
...
Fixes server start runtime errors
2014-11-07 03:45:52 +03:00
Chinsky
ba0de5014b
Merge pull request #6950 from PsiOmegaDelta/Ninja
...
Fixes #6934
2014-11-07 03:45:37 +03:00
Chinsky
1cfb49c141
Merge pull request #6954 from MagmaRam/coat
...
Adds alternate CMO labcoat, with blue trim. It's in the CMO's locker as ...
2014-11-07 03:45:30 +03:00
mwerezak
3d7636728c
Fixes #6941
2014-11-06 19:34:14 -05:00
GinjaNinja32
7d453ece1f
Move glass appearance into reagent datums
2014-11-06 23:49:07 +00:00
GinjaNinja32
0e41cf9cf0
Fixes Toxins Special having no sprite
2014-11-06 21:04:14 +00:00
PsiOmega
f2dcf1acaa
AI fixes
...
Telecommunication interruption no longer permanently disables the ability for synths to state laws if they attempt it during the downtime.
If a synth attempts to state laws during telecommunication interruption it now receives a clear feedback message about its impossibility.
Fixes runtime errors when AIs uses shortcut keys to operate APCs/turret controls when the corresponding window isn't open.
Adds missing AI-restriction check for turret controls.
Airlocks no longer lie about dropping bolts when they cannot be dropped.
2014-11-06 15:36:02 +01:00
