Commit Graph

1602 Commits

Author SHA1 Message Date
Zuhayr
61cb862690 Merge pull request #7300 from PsiOmegaDelta/RoundEnd
Fixes #7295.
2014-12-10 03:11:38 +10:30
mwerezak
81890c968e Adds image for cult talismans
So they aren't blank when examined.
2014-12-08 20:45:15 -05:00
PsiOmega
87998f7eb1 Fixes #7295.
Cleans up round end summary.
Removes duplication of traitor summaries.
Attempts to improve how the traitor purchase log is presented.
Ghosts made manifest now have different names and assignments, otherwise one would get messages like "Anguished Phantom played as an Anguished Phantom".
Instead the message is "Anguished Phantom played as a Manifest Ghost".
2014-12-08 17:06:36 +01:00
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Zuhayr
17a8c59ff9 Fixes #7151 2014-12-08 04:37:07 +10:30
Zuhayr
117dd18284 Adjusted ninja spawn proc to check rig internals. 2014-12-07 20:13:59 +10:30
Zuhayr
54ba518762 Fixes #7253 2014-12-07 18:51:20 +10:30
Snapshot
867e69c770 Merge pull request #7210 from Zuhayr/dev
Fixes #7209
2014-12-02 17:23:19 -08:00
Zuhayr
8e2b0978a8 Fixes #7209 2014-12-02 11:26:44 +10:30
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
Amunak
93859e9652 Dead chat will get announcements when someone joins or leaves it.
This is mainly for wizard and cult rounds, where it is important to know that a wizard/cultist is watching. The announcement was added for most other types of leaving/joining the ghost realm. Admin ghost doesn't get announced for obvious reasons.
2014-11-28 13:05:26 +01:00
PsiOmegaDelta
d9aae79a32 Merge pull request #7008 from Zuhayr/spaceninjas
Hardsuit/voidsuit change, ninja refactor.
2014-11-22 09:30:54 +01:00
Ccomp5950
da3ad0a6db Merge pull request #7099 from Amunak/endgame-info
Added round end summary (attempt 2)
2014-11-22 03:28:38 -05:00
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
Amunak
5dab47c156 Updated the end of round messages for better fit 2014-11-21 13:35:41 +01:00
Amunak
c6211b0eca Fixed missing space in the printplayer proc output 2014-11-21 11:29:29 +01:00
Amunak
0743e0ddb3 Round end summary now shows full player list and more round information 2014-11-21 11:28:40 +01:00
PsiOmegaDelta
921815df04 Merge pull request #6906 from mwerezak/faxmachine
Fax Machines
2014-11-21 08:02:21 +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
Atlantiscze
20571bf1ce Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 14:38:04 +01:00
Atlantiscze
78a4b424ae Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 10:55:33 +01:00
PsiOmega
c45f77f247 Merge remote-tracking branch 'upstream/dev' into APC 2014-11-19 14:40:18 +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
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
PsiOmega
ffbbf2b858 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/ATMOSPHERICS/components/unary/heat_source.dm
2014-11-16 10:38:01 +01:00
Zuhayr
823f01f4bf Changed helmet lights over to a general system/overlays. 2014-11-16 13:40:13 +10:30
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
Zuhayr
40e3ea33f6 Merge resolution. 2014-11-13 16:07:16 +10:30
Chinsky
f2e9be6f90 Merge pull request #6973 from runedog48/master
Bugfixes
2014-11-12 23:46:19 +03:00
Chinsky
9e818ef52f Merge pull request #6983 from PsiOmegaDelta/Event
Event Manager Control
2014-11-12 23:45:02 +03:00
Atlantiscze
f29cd211e6 Implements better powernet warning system (as suggested by mwerezak) 2014-11-12 12:33:23 +01:00
Atlantiscze
ddaac3e175 Powernet Sensor
- Adds remote powernet sensors, power monitoring computers use these by default to monitor power around the station. Default range is 1 Z level + long range versions of sensors
- Powernet sensors mapped in, each subgrid has it's own one (ie: substations compatible)
- Telecomms, mining, research and engineering outposts have long range versions installed, visible even cross-Zlevels
- Powersinks and ninja gloves now trigger problem warning in powernets they affect. This warning is visible to anyone using power monitoring console. TODO: Add more stuff that triggers warnings.
- Powersinks now properly drain APC cells using CELLRATE (@2000W per APC max.)
- Powersinks buffed a bit, to compensate for CELLRATE change (previous line)
2014-11-12 07:07:08 +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
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
b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
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
457e398dac Fixes #6957 2014-11-08 18:11:35 -05: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
PsiOmega
ea874a8baa Merge remote-tracking branch 'upstream/dev' into Ghosts
Conflicts:
	code/modules/mob/dead/observer/observer.dm
2014-11-06 08:40:18 +01:00
Chinsky
8078ffe079 Merge pull request #6939 from PsiOmegaDelta/VerbOptimization
Verb optimization
2014-11-05 23:23:56 +03:00
PsiOmega
611a8113a6 Merge remote-tracking branch 'upstream/dev' into TheGreatEvents
Conflicts:
	code/modules/events/radiation_storm.dm
2014-11-05 14:37:20 +01:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00