Commit Graph

16446 Commits

Author SHA1 Message Date
Neerti
4fcd9e6924 Resolves conflicts, I hope. 2014-12-08 20:46:55 -05:00
mwerezak
81890c968e Adds image for cult talismans
So they aren't blank when examined.
2014-12-08 20:45:15 -05:00
Ccomp5950
d8fb78b711 Merge pull request #7326 from Raptor1628/dev-freeze
Hardsuit Fixes
2014-12-08 20:43:56 -05:00
Ccomp5950
0b56714123 Merge pull request #7321 from GinjaNinja32/cryothing
Cryo computer is now walkable.
2014-12-08 20:43:38 -05:00
Ccomp5950
628f040f00 Merge pull request #7318 from sabiram/patch-1
Potentially fixes white sundress
2014-12-08 20:43:25 -05:00
Ccomp5950
4d615fc294 Merge pull request #7271 from Segrain/dev-freeze
Dev-freeze fixes.
2014-12-08 20:40:02 -05:00
Neerti
dc0f342b0b I left my debug stuff in. 2014-12-08 20:20:39 -05:00
Neerti
e1babe281a Fixes AI cards/mechs, with least bad method. 2014-12-08 20:14:55 -05:00
Raptor1628
921249a335 Hardsuit Fixes
Should merge now, was missing the .dme. Fixes #7307. Adds helmet cameras
for ERT and nukeops. Fixes incorrect lighting overlays. Fixes a weird
sprite.
2014-12-08 19:12:39 -05:00
GinjaNinja32
362af29cbc Fixes #7320 2014-12-08 20:11:07 +00:00
sabiram
b27adda1c3 Potentially fixes white sundress 2014-12-08 14:30:03 -05:00
GinjaNinja32
eb2a62c11b Fix virologists spawning without jumpsuits, IDs or PDAs. Fixes #7312. 2014-12-08 18:48:14 +00:00
PsiOmega
887e2c3abf Fixes #7308.
Adds missing parent call in Del().
2014-12-08 18:20:39 +01:00
PsiOmega
445dba869d Merge branch 'dev-freeze' into dev 2014-12-08 17:38:13 +01:00
PsiOmega
4d6d74b859 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/machinery/portable_turret.dm
2014-12-08 17:37:42 +01:00
Akai Alonkai
268ec0d36a Implements existing assistant alternate job titles
Adds an option to choose one of the alternate job titles for assistant
already defined at
https://github.com/Baystation12/Baystation12/blob/master/code/game/jobs/job/assistant.dm#L12
2014-12-08 11:12:30 -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
a2d3a0055e Fixes #7301 2014-12-09 02:35:46 +10:30
GinjaNinja32
439cbd6255 Properly merge stuff 2014-12-08 15:36:49 +00: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
Mloc
efe78df3ff Merge pull request #7299 from Loganbacca/freezefix
Fixes omni-filters not working
2014-12-08 13:17:36 +00:00
Loganbacca
92c81aa958 Fixes omni-filters not working 2014-12-09 01:15:10 +13:00
Amunak
fb35debec9 Valves will now tell you if they are open or closed when you examine them. 2014-12-08 12:38:42 +01:00
Mloc
83f2a5ba5a fix some misplaced set_dir()s
fixes part of #7284
fixes #7288
fixes one of #7287

Signed-off-by: Mloc <colmohici@gmail.com>
2014-12-08 10:09:09 +00:00
Segrain
7f1b5f0603 Fix for #7285. 2014-12-08 11:20:46 +03:00
Atlantiscze
7754fda105 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into substation-features 2014-12-08 06:58:50 +01:00
Atlantiscze
2016d92358 RCON Console Construction
- RCON consoles can now be built. They require quite high end circuit board from research, however.
2014-12-08 06:58:10 +01:00
PsiOmegaDelta
19b359f4eb Merge pull request #7268 from GinjaNinja32/playerpanel_lang
Allow forcesay with no client, add language toggles to player panel
2014-12-08 06:45:38 +01:00
PsiOmegaDelta
e66f5ed765 Merge pull request #7272 from Raptor1628/dev-freeze
Hardsuit Mark Two, more Hulabaloo
2014-12-08 06:45:11 +01:00
Atlantiscze
d761eaf38c I am an idiot.
- Replaces typo which caused SMES wire pulsing to be broken.
2014-12-08 06:27:11 +01:00
mwerezak
d506eca89a Adds tape rolls to the tool storage spawner list 2014-12-08 00:15:27 -05:00
Atlantiscze
321e4d443c Adds ability to modify RCON tags on SMES units and breaker boxes.
- Use multitool to change (for SMES, screwdriver the SMES first to open cover)
2014-12-08 06:10:47 +01:00
Neerti
9e9c297b2e Begins work,
Holopads can receive and send emotes.
The AI, when using 'me', will check if a holopad is being used.  If so, the holopad will output the emote.  If not, it's outputted from the core.
The AI will hear emotes from near an active holopad.
There is a new obj verb called 'see_emote()', that works similarly to hear_talk().
custom_emote() modified to have 'seeing_obj' list.  May be resource-intensive, not sure.
pAIs can now hear emotes, without issue.
Carded AIs can hear emotes, but they hear themselves twice.
Mechs do not hear emotes correctly at this time.
2014-12-07 23:03:42 -05:00
mwerezak
f9564cbe5e Poster fixes
Fixes #7261
Fixes placed posters being visible on both sides of the wall.
Fixes the poster_type var used to specify certain poster designs on the
map not working correctly, and makes the nuke op shuttle poster an
actual poster.
Poster placement now belongs to the poster object instead of turf/simulated/
Posters can now be placed on unsimulated and shuttle walls.
2014-12-07 22:30:08 -05:00
Atlantiscze
39229e4a1f Few updates to SMES wiring datum:
- Pulsing input/output wires now toggles the input/output settings, instead of disabling for 60s
- Pulsing grounding wire now disables grounding until the wire is cut and mended again.
2014-12-08 03:55:35 +01:00
Zuhayr
371bdb10d9 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-08 13:03:20 +10:30
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Atlantiscze
994ad591e6 RCON System (v1.0)
- Allows remote control of SMES units and Breaker Boxes.
- Adds wires to SMES units. Wires may be cut/pulsed for various effects. Signallers are supported.
- RCON console(s) may be used to monitor the SMES units (which have RCON enabled) remotely, showing output loads and charge percentages.
- SMESs may be quickly discharged by cutting the grounding wire. This however comes with little risk of overload which may damage APCs on output powernet.
2014-12-08 03:30:20 +01:00
Raptor1628
75659ab66a Hardsuit Mark Two, more Hulabaloo
Adds all sprites for the nukeop and research hardsuit. Shuffles around
hardsuit spawns and gear so they make sense, especially for the ERT,
they still only have two hardsuits per department, but there are enough
magboots and vests for the people who need the regular armor. Added the
medical hardsuit and its attendant gear to the station hardsuit list.
Added all of the xenoarch gear to the hazmat hardsuit for Zuh. Moves
some suit storage things around as they were lost somewhere along the
way since I committed them. Moves the Hazard Suit custom item over to
hardsuit code to prep for them being buildable on station at some point.
For now has the same stats as a voidsuit, no modules, just drains power
and has some extra pretty sprites. Sending this over to dev freeze
because most of it is required for hardsuits to be nice and pretty for
master. Now compatible with latest fixes.
2014-12-07 21:25:08 -05:00
Segrain
e0ab31756d Fix for double definition. 2014-12-08 04:01:00 +03:00
Segrain
639c61721b Fix for #7261. 2014-12-08 03:58:42 +03:00
Segrain
aa575b446a Fix for #7260. 2014-12-08 03:57:02 +03:00
Ccomp5950
b4becaa587 Merge pull request #7264 from Zuhayr/master
Fixes, death refactor.
2014-12-07 19:38:21 -05:00
Zuhayr
b556609e27 Replaces some macros. 2014-12-08 10:34:36 +10:30
GinjaNinja32
48a8acad52 Removes some world<< statements 2014-12-07 23:06:49 +00:00
PsiOmegaDelta
5b6d3ab55a Merge pull request #7263 from mwerezak/hydrotray
Fixes atoms with no flags set being walkable
2014-12-07 22:06:10 +01:00
PsiOmegaDelta
3ddb6eed96 Merge pull request #7222 from mwerezak/holospace
Holodeck
2014-12-07 22:05:49 +01:00
PsiOmegaDelta
79cd5f6430 Merge pull request #7251 from Loganbacca/implantfix
Implant fixes/cleanup
2014-12-07 22:05:14 +01:00
PsiOmegaDelta
a0117facef Merge pull request #7256 from mwerezak/shuttle
Makes forced launch handled by shuttle/process()
2014-12-07 22:02:36 +01:00
Zuhayr
ac03846778 Merge pull request #7239 from GinjaNinja32/ahelp
Allow typing all arguments to adminhelp
2014-12-08 05:16:47 +10:30