Commit Graph

1265 Commits

Author SHA1 Message Date
PsiOmegaDelta d9aae79a32 Merge pull request #7008 from Zuhayr/spaceninjas
Hardsuit/voidsuit change, ninja refactor.
2014-11-22 09:30:54 +01:00
Zuhayr c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
PsiOmega 71064574ed Merge remote-tracking branch 'upstream/dev' into AirAlarms
Conflicts:
	code/game/machinery/alarm.dm
2014-11-21 15:28:54 +01:00
mwerezak 348c9d19f7 Merge remote-tracking branch 'upstream/dev' into faxmachine
Conflicts:
	code/WorkInProgress/kilakk/fax.dm
	code/modules/paperwork/faxmachine.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photocopier.dm
	maps/tgstation2.dmm
2014-11-20 14:57:35 -05:00
PsiOmega 2fddc6a832 Less copy-pastah
Reduces copy-pasted code in the atmospheric monitor computer code.
2014-11-20 13:18:07 +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
DJSnapshot 9d5ba587ac Mentors don't need faxes, communications, or prayers. 2014-11-17 15:08:36 -08:00
mwerezak 9eb6dfdef4 Fixes #7026
Uploads species var from human to carbon mobs.
2014-11-16 14:43:38 -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 90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
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
Ccomp5950 28635e3f8f Merge pull request #6958 from PsiOmegaDelta/TimeOfNews
Newscaster and photo cleanup
2014-11-07 01:00:18 -05: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
PsiOmega 77c52f48a8 Newscaster and photo cleanup
Synthetics can no longer magically print color images on a black-and-white photocopier.
No longer possible for organics to acquire a synth-image by un-attaching it from a newscaster.
News articles now come with a timestamp and photo captions, if anything was penned on an attached photo.
Reception-checks no longer unconditionally sleeps the thread. Was causing havoc with NanoUI.

Misc. code refactoring.
2014-11-06 13:28:17 +01:00
Chinsky 8078ffe079 Merge pull request #6939 from PsiOmegaDelta/VerbOptimization
Verb optimization
2014-11-05 23:23:56 +03:00
GinjaNinja32 7a5b965907 Fixes newly-vended laptops opening windows and giving close messages 2014-11-05 17:06:01 +00:00
PsiOmega bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
PsiOmega cb6a855292 Cyborg detonation notice
When a cyborg is detonated by a cyborg console  the AI is now notified about the event.
Violently applied destruction remains without notice.
2014-11-03 19:40:24 +01:00
mwerezak 3f2aeb6dc4 Merge remote-tracking branch 'upstream/dev' into faxmachine 2014-11-01 11:49:15 -04:00
mwerezak 5d686b7510 Removes unused file 2014-10-31 00:39:39 -04:00
PsiOmega bf1e6af508 Z-Level Compatibility
Now possible to configure 3 different kind of Z-levels.
Station levels: Which Z-levels the station exists on.
Contact levels: Which Z-levels are typically affected by, for example, Code Red which alters the visual state of fire alarms.
Player levels: Which Z-levels a character can typically reach.
2014-10-30 14:29:56 +01:00
Chinsky 541d878d54 Merge pull request #6865 from PsiOmegaDelta/PDA
PDA newscast reception
2014-10-29 06:30:54 +03:00
PsiOmega 9c41148a08 PDA newscaster
One can one access and view newsfeeds from the comfort of one's PDA.
Possible to change and disable the newsmessage beep.

Known issues:
Unlike browse() NanoUI does not appear to wait for browse_rsc(), the method which to transfers image to the client's cache, to finish.
This often results in newsfeeds not always displaying their images the first time they are viewed.
2014-10-28 17:10:35 +01:00
PsiOmega 8e3861141c Merge branch 'dev' into PowerTwo
Conflicts:
	code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
Chinsky bad385e1d1 Merge pull request #6791 from Zuhayr/dev
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-21 01:13:17 +04:00
Zuhayr 99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
mwerezak b8cfe87ca2 Fixes #6783, moves spacesuits to a separate file
Adds an update_clothing_icon() proc to clothing items that will call the
relevant icon update proc on the mob which is equipping the clothing, if
any. Changes various clothing procs to not call update icon procs on usr
which may not even be the mob wearing the clothing.
2014-10-18 22:12:15 -04:00
mwerezak e53bd0e237 Merge remote-tracking branch 'upstream/dev' into faxmachine 2014-10-15 21:12:21 -04:00
mwerezak b0cdcc9796 Adds photocopier based faxmachine, removes redundant photocopier vars 2014-10-15 21:07:57 -04:00
PsiOmega a1ee4e766b Basically ripped over /tg/'s powernet and cable code into our own codebase.
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
2014-10-13 17:13:04 +02:00
Zuhayr 5989a0c625 Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it. 2014-10-12 11:48:54 +10:30
Zuhayr 409be10611 merge resolution, mostly removing attack_alien() from modified files. 2014-10-12 02:09:54 +10:30
mwerezak 7a81e116d2 Fixes #6647
grabbed_by assignment is now done in the grab constructor, instead of
leaking out all over the place.
2014-10-10 00:23:03 -04:00
Zuhayr 0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
PsiOmega fe126626ac Cleans up radio frequency numbers.
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
2014-09-18 13:07:34 +02:00
DJSnapshot 0728a1f8e8 gives warden the ability to use faxes 2014-09-14 20:07:00 -07:00
DJSnapshot 3505ad85d2 Colors fixed. 2014-09-14 17:48:24 -07:00
DJSnapshot 01529c0e29 Adds sol gov fax. Makes replies return to sender fax only 2014-09-14 01:47:55 -07:00
Zuhayr 1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
Zuhayr 29e59ff456 Merge pull request #6289 from comma/overmap
Overmap
2014-09-08 11:21:37 +09:30
Zuhayr 059532c155 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-09-01 22:03:29 +09:30
Whitellama f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Chinsky fcd1c7749a Tape now does not stop anything like magical wall it used to be.
If someone with no access walks through it, it adds his fingerprints/fibers, gives him an omnious message and crumples the tape.
2014-08-29 00:50:33 +04:00
Walter0o c0b6f82ad0 emergency HTML/JS injection fix MK2, the underping.
fixes a minor oversight in proc order after i shuffled them around.
2014-08-27 15:42:59 +02:00