Commit Graph

17479 Commits

Author SHA1 Message Date
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
Zuhayr
dfca49c900 Fixes #7105 2014-12-08 05:14:04 +10:30
Zuhayr
1211360118 Fixes #6974 2014-12-08 05:00:54 +10:30
Zuhayr
17a8c59ff9 Fixes #7151 2014-12-08 04:37:07 +10:30
Zuhayr
7ff46d64fb Fixes #7162. Eject ID verb for laptops is still busted though. 2014-12-08 04:22:56 +10:30
GinjaNinja32
e473e3d2ba Fix compile error due to depending on #7267 2014-12-07 17:23:30 +00:00
Zuhayr
a7d526f8b1 Fixes #7119 2014-12-08 03:51:21 +10:30
Zuhayr
74db269c40 Fixes #7266 2014-12-08 03:51:01 +10:30
GinjaNinja32
9e2cf5266c Allow forcesay with no client, add language toggles to player panel 2014-12-07 17:08:36 +00:00
GinjaNinja32
b6de85ec56 Fixes, better handling of things 2014-12-07 17:01:19 +00:00
Zuhayr
1176510fb2 Amendments to previous commit. 2014-12-08 03:29:03 +10:30
GinjaNinja32
17597af7fc Better handling of language list, mobs no longer require noise-language in their list 2014-12-07 12:09:29 +00:00
GinjaNinja32
6a975a1e6a Noise emotes
Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
2014-12-07 12:09:02 +00:00
Zuhayr
b30be0a352 Fixes #7199 2014-12-07 22:13:31 +10:30
Zuhayr
be562e675c Actually fixes scanners. 2014-12-07 21:29:30 +10:30
Zuhayr
0fe2159f86 Fixes #7092 2014-12-07 21:21:00 +10:30
Zuhayr
35f5bb16c9 Fixes #7188 2014-12-07 21:20:47 +10:30
Zuhayr
e4a332c5b6 Fixes #7262 2014-12-07 21:20:24 +10:30