Commit Graph

12971 Commits

Author SHA1 Message Date
Ccomp5950 cab064cd16 Merge pull request #7340 from Zuhayr/dev-freeze
Dev-freeze fixes.
2014-12-09 11:48:33 -05:00
Zuhayr 4aa7c072ca Merge pull request #7337 from Loganbacca/glassesfix
Science goggles overlay fix
2014-12-10 03:11:18 +10:30
PsiOmegaDelta 41cca1b250 Merge pull request #7303 from TwistedAkai/dev
Implements existing assistant alternate job titles
2014-12-09 17:34:31 +01:00
Zuhayr 39f303c50e Actually fixes hardsuit back icons. 2014-12-10 02:37:23 +10:30
Zuhayr fea8868753 Fixes #7310 and should also fix #7311 2014-12-10 02:28:03 +10:30
Zuhayr e80f59742d Fixes #7316 2014-12-10 00:56:26 +10:30
Zuhayr bc394b72d6 Fixes diona and simple_animals eating snacks. 2014-12-09 22:14:41 +10:30
Segrain 4ae3d3029f Fix for #6643. 2014-12-09 14:54:20 +03:00
Segrain 065d9b110c Fix for #6476. 2014-12-09 14:52:43 +03:00
PsiOmegaDelta 63a5d009c7 Merge pull request #7267 from GinjaNinja32/noise
Audible emote improvement, adds ability to emote over radio.
2014-12-09 11:54:57 +01:00
Zuhayr 7bc72fb836 Tidied up/fixed up the rig back icons. 2014-12-09 21:01:17 +10:30
Zuhayr ff2c23714f Bunch of diona nymph tweaks/fixes. 2014-12-09 20:52:41 +10:30
Loganbacca 2b98f70f9f Science goggles overlay fix 2014-12-09 22:05:14 +13:00
PsiOmega 48aeefa85a Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/talisman.dm
	maps/exodus-1.dmm
2014-12-09 09:42:14 +01:00
PsiOmega 924955a4c8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-12-09 09:07:38 +01:00
Segrain 4b7b910311 Fix for #7324. 2014-12-09 09:39:05 +03:00
PsiOmegaDelta f9e59d430b Merge pull request #7329 from mwerezak/talisman
Adds image for cult talismans
2014-12-09 07:26:10 +01:00
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 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 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
sabiram b27adda1c3 Potentially fixes white sundress 2014-12-08 14:30:03 -05:00
PsiOmega 445dba869d Merge branch 'dev-freeze' into dev 2014-12-08 17:38:13 +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
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
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 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
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 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
GinjaNinja32 48a8acad52 Removes some world<< statements 2014-12-07 23:06:49 +00:00
PsiOmegaDelta 79cd5f6430 Merge pull request #7251 from Loganbacca/implantfix
Implant fixes/cleanup
2014-12-07 22:05:14 +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
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
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