Commit Graph

551 Commits

Author SHA1 Message Date
Zuhayr
a76af3c7c5 Fixes #7572 2014-12-30 16:33:34 +10:30
Zuhayr
c49cb0c645 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze 2014-12-24 22:43:10 +10:30
Zuhayr
a82ec718f3 Fixes #7508 2014-12-24 12:43:36 +10:30
Zuhayr
591fc164de Updating rack paths to match previous commit. 2014-12-24 12:26:43 +10:30
Zuhayr
2ed0e433aa Table/rack refactor. Fixes #7509 2014-12-24 12:14:48 +10:30
Zuhayr
7c2407c21c Fixes #5220 2014-12-23 13:23:35 +10:30
Amunak
d28cb57f79 Merges upstream/dev to ref, resolves merge conflicts 2014-12-18 03:44:28 +01:00
Amunak
d20ccdb6b4 More name updates and refactoring for research
Also fixes compile errors
2014-12-18 03:26:55 +01:00
Amunak
4882074739 Code formatting, EOL at EOF fixes, refactoring 2014-12-18 03:11:49 +01:00
Amunak
edffbc680d Fixed capitalization of most game items 2014-12-18 03:10:36 +01:00
PsiOmega
efb6adb452 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-14 00:27:16 +01:00
Zuhayr
d2803ec4d7 Merge resolution. 2014-12-13 23:10:46 +10:30
Zuhayr
7770b355dd Fixes #7404 2014-12-13 22:15:13 +10:30
PsiOmega
b9ce5404d8 Fixes lab coat without icon.
Simply by changing it to the new labcoat variant that can be closed/opened.
Still created a proper definition for the old lab coat, /obj/item/clothing/suit/storage/labcoat, as it's inherited by custom gear.
2014-12-12 14:30:12 +01:00
PsiOmega
cf78fe903b Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-12 09:04:09 +01:00
PsiOmega
18ee756ca2 Fixes broken span statement.
Adds a proper class and closer.
2014-12-11 19:05:59 +01:00
GinjaNinja32
681a6d21ea Merge remote-tracking branch 'upstream/dev' into !
Conflicts:
	code/modules/mob/hear_say.dm
2014-12-08 15:32:49 +00:00
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Zuhayr
b556609e27 Replaces some macros. 2014-12-08 10:34:36 +10:30
Zuhayr
dfca49c900 Fixes #7105 2014-12-08 05:14:04 +10:30
Zuhayr
1211360118 Fixes #6974 2014-12-08 05:00:54 +10:30
GinjaNinja32
6a975a1e6a Noise emotes
Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
2014-12-07 12:09:02 +00:00
mwerezak
89cef05a19 Merge remote-tracking branch 'upstream/dev' into secure-airlock 2014-12-04 17:15:27 -05:00
mwerezak
58f227ec69 Cleans up airlock electronics
Removes the icon_state hack
Moves airlock electronics creation into it's own proc.
Moved airlock creation from a door assembly to airlock/New()
2014-12-04 16:40:27 -05:00
PsiOmega
52346094f8 Fixes #7214.
Dismantling a window should now return an appropriate number of sheets for its type.
2014-12-03 11:06:33 +01:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega
0f8156e77e Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
2014-11-29 10:09:03 +01:00
mwerezak
b84bb4ff23 Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup. 2014-11-28 19:37:31 -05:00
GinjaNinja32
48343a23fb Fix most nullspace items, rewrite floor tiles not to del() on every place/remove 2014-11-24 17:05:46 +00:00
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
Atlantiscze
78a4b424ae Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 10:55:33 +01:00
Zuhayr
2b4cd94650 Merge resolution. 2014-11-19 23:28:09 +10:30
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
4d64a11acd Manual merge of head.dmi. 2014-11-14 23:02:16 +10:30
Zuhayr
ebbb9b36b5 Moved everything to a module-based hardsuit system.
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
2014-11-14 22:57:26 +10:30
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