Commit Graph

518 Commits

Author SHA1 Message Date
Atlantiscze
78a4b424ae Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 10:55:33 +01:00
Zuhayr
660b32629e Merge resolution. 2014-11-19 23:19:33 +10:30
Zuhayr
cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
Zuhayr
0f0bca6889 Merge pull request #7038 from mwerezak/diona-scream
Fixes #7026
2014-11-19 23:11:50 +10:30
Atlantiscze
61990872d8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-19 13:15:40 +01:00
mwerezak
9eb6dfdef4 Fixes #7026
Uploads species var from human to carbon mobs.
2014-11-16 14:43:38 -05:00
MagmaRam
cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat
Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.
2014-11-16 02:56:32 -05:00
Zuhayr
31b6cc19ad Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything. 2014-11-13 21:41:02 +10:30
Zuhayr
4bb4145f5d Readded interactions for slimes and monkeys using attack_generic proc. 2014-11-13 19:18:34 +10:30
Zuhayr
90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
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
f322a6af5e Merge pull request #6992 from PsiOmegaDelta/BodyBag
Shapely body bags.
2014-11-12 23:45:36 +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
835d04290c Modifications to sensors code
- More stuff now triggers powernet warnings: People getting shocked by machinery (primarily door, but can be anything else powered by APC), and grilles. Thanks to @mwerezak for suggestion.
- Monitoring computer now has slightly different icon_state when it detects powernet warning. This is checked and updated every 5 MC ticks (ie, slightly delayed)
- Fixes ocassional runtime in powernet_sensor.dm
- Powersinks buffed a bit more. Drain rate changed from 0.6MW to 1MW. 1MW is full output of main engine SMES.
- Powersinks also dissipate small amount of internal energy charge over time. (20kW)
2014-11-12 14:54:56 +01: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
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
Zuhayr
b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
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
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
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
Akai Alonkai
44f7e4edd8 Full Window returns stacked glass
Tweaked code to make a full window return a stack of two, rather than
two separate sheets.
2014-11-05 16:53:17 -05:00
MagmaRam
f922703938 Adds alternate CMO labcoat, with blue trim. It's in the CMO's locker as well as the regular (solid blue) labcoat. The CMO still spawns with the solid blue one. 2014-11-05 14:43:12 -05:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Akai Alonkai
7243fdb284 Add Window Dismantling
Enables dismantling of a window (100% return) with a wrench, if the
window is fully unsecured. Windows which cannot be dismantled will
return a message saying so for clarity. Dismantling displays a visible
message for clarity.
2014-11-05 00:24:56 -05:00
PsiOmega
a9ef2b61c0 Wiring Upgrade
Continues the wiring upgrade. Now cameras, airlocks, robots, and air alarms also use the new wire datum system.
Global wiring code is now removed but there are sneaky objects which didn't rely on them such as mulebots and autolathes.

Fixes a few issues from the previous upgrade.
2014-11-04 14:27:46 +01:00
mwerezak
b2dc8f1142 Fixes #6660
Also makes flipping tables block climbing.
2014-11-01 21:38:04 -04:00
RavingManiac
027995c041 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-10-30 23:24:33 +08:00
RavingManiac
2ecf93563c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-10-27 20:48:25 +08:00
mwerezak
4e7a8fac34 Hoverpod tweaks
Hoverpods are a subtype of mecha/working again, but drills are now
ripley specific. Hoverpods have increased cargo and can carry 3 tools.
Hoverpod crates now come with a clamp and passenger compartment
pre-installed.
Brings back the combatpod, can equip weapons.
2014-10-26 13:16:30 -04:00
Chinsky
44a01be13f Merge pull request #6856 from Baystation12/dev-freeze
Freeze - Dev
2014-10-26 09:41:07 +03:00
RavingManiac
27df7dca09 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-10-26 00:59:58 +08:00
RavingManiac
e0d48950b4 Doors can now be broken through damage. Broken doors can be crowbarred open. High-securiry doors automatically bolt themselves when broken. Doors which are damaged, but not broken, can be repaired with sheet metal. Broken doors must be reconstructed. Spark overlays for damaged and broken doors.
Windows and doors will display messages indicating extant of damage as they are damaged (e.g. "Cracks begin to appear in [src]!")

Metal rods can substitute for crowbars to force unpowered and broken doors, as well as firelocks.

Window damage code cleaned up and centralized.
2014-10-26 00:59:03 +08:00
Zuhayr
f5d43128cc Merge pull request #6839 from Zuhayr/dev
Dev
2014-10-24 13:36:28 +10:30
Zuhayr
a5e11e208f Merge pull request #6823 from mwerezak/hoverpod
Fixes #6820, #6822, adds ion trails to hoverpods.
2014-10-24 09:16:44 +10:30
PsiOmega
acd210cdc5 Mirror Science
Future science to explain magic hair-corrective abilities.
2014-10-22 22:53:50 +02:00
Graham Lloyd
c764a94073 fixes some annoying punctuation errors. 2014-10-22 15:58:27 -04:00
mwerezak
604ad08f07 Fixes #6820
Readds missing check, makes hoverpods their own mech type and moves them
to another folder.
2014-10-22 00:15:42 -04:00
GinjaNinja32
c585a97162 Let's actually use these barsign sprites. 2014-10-20 23:58:26 +01:00
Zuhayr
cd2b5e761d Fixes being unable to knock on windows. 2014-10-13 11:21:37 +10:30
Zuhayr
9b23315359 Fixes #6644 2014-10-11 07:44:48 +10:30
Gamerofthegame
a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
Zuhayr
6c96f3d66b Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev 2014-10-02 02:39:37 +09:30
Zuhayr
305416d5c5 Merg resolution. 2014-10-02 02:33:06 +09:30
Zuhayr
3f05362577 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-10-01 18:16:04 +09:30
Chinsky
165bbadc10 Merge pull request #6551 from RavingManiac/dev
Space floating effect
2014-10-01 10:01:25 +04:00
Mloc-Argent
6fb1667b44 fixes #4742
not a full fix, there's too many small cases where OPENCONTAINER
isn't checked, but this is everything in the report

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-30 20:52:00 +01:00