mwerezak
5c66480259
Makes vending machine coffee price in line with other items
2014-11-13 00:41:25 -05:00
Zuhayr
40e3ea33f6
Merge resolution.
2014-11-13 16:07:16 +10:30
ccomp5950
bec21da0cd
AI's no longer able to use specop's shuttle console.
...
Keeps naughty AI's from launching it early.
2014-11-12 23:37:25 -05:00
Ccomp5950
701f5feba4
Merge pull request #7001 from atlantiscze/rnd-fix
...
Rnd fix
2014-11-12 23:28:41 -05:00
Ccomp5950
0fa7d59b46
Merge pull request #7004 from mwerezak/stance
...
Cleans up human stance code
2014-11-12 23:24:13 -05:00
mwerezak
fde6b6cc56
Fixes door projectile damage
2014-11-12 23:14:40 -05:00
mwerezak
f5ccbe5ba7
Cleans up human stance code
...
Merges leg_tally and can_stand, streamlined the stance checks in organ processing.
Removes half-implemented has_limbs (assigned to 1 but never updated anywhere).
Having only one foot now slows you down.
2014-11-12 22:56:55 -05:00
mwerezak
0bff4d7028
Merge remote-tracking branch 'upstream/master' into window-fix
2014-11-12 20:09:25 -05:00
mwerezak
ab2b4608e0
Fixes #6702 and cleanup
...
Makes reinforced glass a subtype of glass, cleans up window creation copypasta.
Cleaned up window initialization leaking outside of the window constructor.
Removes unnecessary init_dir var from windows.
2014-11-12 20:09:04 -05:00
MagmaRam
4794898cec
Fix for jobs that were spawning with the old labcoat types rather than the new ones, as well as lockers that were.
2014-11-12 18:48:47 -05:00
Chinsky
f2e9be6f90
Merge pull request #6973 from runedog48/master
...
Bugfixes
2014-11-12 23:46:19 +03:00
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
Atlantiscze
64b6d6e27b
Removes bluespace crystal RnD datum
...
- Bluespace crystals were removed, but datum was left. Trying to build it causes runtime.
2014-11-12 12:16:13 +01:00
Atlantiscze
d915fb2391
RnD Console Runtime Fix
...
- This will mostly fix runtimes when items are removed and design datums are left behind.
- User now gets option to reset the console, and is told to submit bug report stating which item was being built.
- Also inserts warning into server log.
2014-11-12 12:15:14 +01: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
MagmaRam
cb723db505
Some mildly offensive wording to less offensive wording. I'm not actually sure how that got in there.
2014-11-11 13:44:57 -05:00
MagmaRam
3df1ad727a
Forgot to actually set icon_open and icon_closed for labcoats. Whoops! Fixes that.
2014-11-11 13:00:38 -05:00
MagmaRam
d09d8cf921
Apparently the blue lawyer jacket didn't actually button up properly. Now it should button up, and uses the same system as everything else.
2014-11-11 12:47:02 -05:00
MagmaRam
3e5117e3eb
All coats that can be buttoned are now subtypes of /obj/item/clothing/suit/storage/toggle
...
This includes labcoats, IA jackets, first responder jackets, and the brown leather jackets.
This way, code for button toggling doesn't have to be duplicated for labcoats and other coats, and it's easier to add other types of coats that can be buttoned up if someone wants.
2014-11-11 11:27:11 -05:00
PsiOmega
d2f8d705a3
Fixes compilation issues, SMES can again partially recharge.
2014-11-11 17:02:05 +01:00
PsiOmega
0468f12e91
Merge remote-tracking branch 'upstream/dev' into APC
...
Conflicts:
code/game/gamemodes/events/power_failure.dm
code/modules/power/smes.dm
2014-11-11 14:13:02 +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
MagmaRam
4a705bd371
Minor change for comments and defining the variables by full path.
2014-11-10 22:49:04 -05:00
MagmaRam
4c5695a6cc
Changes labcoat code so coat buttoning isn't based on a giant switch, and icon states are set in the item itself rather than the logic for buttoning and unbuttoning.
...
labcoat_open is the icon state of the labcoat while open, and labcoat_closed is the icon state of the labcoat while closed.
2014-11-10 22:34:12 -05: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
PsiOmega
41e4572ccf
Central Command Summary Filter
...
Strike team leaders had their own special role which occasionally could make them end up in the Central Command summary.
Removes reference to "THE" Syndicate.
2014-11-09 19:19:37 +01:00
runedog48
8fe3642726
Fixes #6831
...
Observing people with oil-stained clothes no longer states that they're
blood-stained.
2014-11-09 13:14:30 -05:00
runedog48
ee3f670e74
Fixes #6976
...
Sterile Masks now work with the custom loadout.
2014-11-09 12:31:42 -05:00
runedog48
e7993b1ec6
Fixes #6940
...
Empty lines will not appear in cloning records anymore.
2014-11-08 20:03:05 -05:00
runedog48
2928455d70
Fixes #6967
...
Virologists now only spawn with 1 survival kit.
2014-11-08 18:39:30 -05:00
runedog48
457e398dac
Fixes #6957
2014-11-08 18:11:35 -05: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
