Commit Graph

854 Commits

Author SHA1 Message Date
AnturK
614b17907d Makse game world plane use client color 2017-06-12 10:39:13 +02:00
Robustin
b409a52d42 Blood Cult Nerf: Restricted Nar-Sie summoning locations (#28137)
* Restricted Blood Cult Summoning

* fixed warning
2017-06-08 07:28:40 -04:00
Leo
453b0c4dfd Merge pull request #28142 from Tacolizard/parallax
Adds another parallax layer
2017-06-07 16:17:57 -03:00
Tacolizard
e80bf88bb9 add and implement icon 2017-06-06 11:41:43 -07:00
Joan Lung
db323e2e3b Tinkerer's Daemons are no longer totally disabled if you drop below the servant requirement 2017-06-06 10:32:07 -04:00
Joan Lung
aefad8c690 Removes Revenant scriptures entirely (#28061) 2017-06-05 13:05:15 -03:00
Joan Lung
3ed357a5d9 Clockcult scripture tiers can no longer be lost by dipping below their requirements once they are unlocked (#28047) 2017-06-05 11:12:29 -03:00
kevinz000
29a1734b3c [READY]Replaces R&D accelerator laser with beam rifle, adds MouseMove and mouse parameter tracking to client, adds blast cannons! (#27618)
kevinz shitcode
2017-05-29 20:44:42 -05:00
Jordan Brown
69ece91a38 Moves attack chain proc from global to obj/item (#27659) 2017-05-26 13:11:43 -03:00
Robustin
5569c259ab Merge branch 'master' into culttweaks2 2017-05-22 10:36:57 -04:00
Joan Lung
5c36cba014 Merge pull request #27495 from AnturK/shootingblind
Fixes shooting out of view windows
2017-05-22 08:43:39 -04:00
Really-Good-Soda-Flavor
41294bd58d Reorganizes martial arts and stores them in the MIND. (#27324)
* Reorganizes martial arts and stores them in the MIND.

* Moves martial arts to mind.

* Added more sanity checks

* MORE sanity checks!

* Fixes the checks.
2017-05-22 14:12:27 +02:00
oranges
687a7a9e0b Merge pull request #27515 from kevinz000/patch-168
properly fixes quickgrab exploit
2017-05-22 13:43:36 +12:00
Robustin
eb7f2ddc99 Merge branch 'master' of https://github.com/tgstation/tgstation into GG3
# Conflicts:
#	icons/obj/guns/projectile.dmi
2017-05-21 17:54:44 -04:00
kevinz000
d1e8a93584 Update click.dm 2017-05-21 14:01:27 -07:00
kevinz000
8540139740 Update click.dm 2017-05-21 13:48:53 -07:00
AnturK
44e97aa905 Fixes shooting out of view windows 2017-05-21 12:53:34 +02:00
kevinz000
788647b8b6 Update click.dm (#27492) 2017-05-21 21:36:07 +12:00
Robustin
44bcd278dd Merge branch 'master' into ganguns 2017-05-20 19:41:52 -04:00
Robustin
425e8fca71 Fixes galore 2017-05-19 18:20:48 -04:00
AnturK
b016998e3e Fixes buttons under doors. 2017-05-19 17:50:38 +02:00
AnturK
83e90cca22 Fixes clicking things under windows/doors. (#27292) 2017-05-18 07:05:41 -03:00
Joan Lung
1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
ShizCalev
c4943b2125 Fixes TK butchering after item is gone (#27280) 2017-05-16 20:12:14 -03:00
Robustin
7a4a7c3272 Merge branch 'master' of https://github.com/tgstation/-tg-station into gangguns2
# Conflicts:
#	icons/obj/turrets.dmi
2017-05-16 17:37:00 -04:00
Robustin
3f47e55fe1 Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#27085)
* Chosen Harvesters

* Update runes.dm

* New Cult Ending

* New Cult Ending

* Cinematics added

* A couple fixes

* Update ticker.dm

* Final Touches

* Done

* Desc fix

* Update alert.dm

* Update cult_comms.dm

* requested changes

* Update uplink_item.dm

* Update alert.dm

* Update runes.dm

* Update runes.dm

* fuckinglaunchpad

* Update machine_designs.dm

* Fucking launchpad errors

* Update narsie.dm

* Update mode.txt

* moves a few pixels on the sprite for Joan

* whatever just merge it

* You know whats BS?

* While you're at it... merge this shit

* Update living_defense.dm

* Update constructs.dm

* Update living_defense.dm
2017-05-16 08:50:46 +02:00
Robustin
b7a01fb0b0 Super Advanced OP Machinegun 2017-05-15 19:20:02 -04:00
Joan Lung
8b912f84aa Fixes a bunch more cult bugs (#27034) 2017-05-08 13:17:40 -03:00
oranges
e8c1c60942 Merge pull request #26980 from AnturK/click-fixes
Small Click refactor.
2017-05-08 20:05:39 +12:00
AnturK
e376f9ab7b Fixes some issues 2017-05-07 23:35:38 +02:00
AnturK
05e0a2348a Reach fixes 2017-05-07 16:10:17 +02:00
Joan Lung
74f00e629f Cult fixes (#26990)
* Cult fixes

* ha ha whoops

* whoooops

* whoops x3 combo
2017-05-07 00:51:40 -03:00
Joan Lung
f17dd48f94 Merge pull request #26631 from Robustin/CultMasterAttempt2
2017 Cult Overhaul P1:  Cult Master and Datum Cult
2017-05-06 12:55:50 -04:00
AnturK
14619fc553 Indeed 2017-05-06 15:11:37 +02:00
AnturK
8f40e14a79 Small Click refactor. 2017-05-06 14:10:11 +02:00
coiax
b633cd6ba2 Moves languages to a holder datum, gives mind its own language holder (#26776)
* Ghosts now have a language menu

🆑 coiax
add: Ghosts can now modify their own understood languages with the
language menu.
/🆑

- Language menu is now on /atom/movable, and can be opened by any atom
with the `open_language_menu` proc.
- Used for testing, and simulating what various station members hear.

* Language holders, I

* Language holder, II

* Dos line endings

* MIND LANGUAGES

* Fixes some mobs not having language holders in their minds

* Shadow languages

* How did you lose the holder?

* Mob level IC->Open Language Menu verb

* Gives draconic to silicons

* Lazy breeki

* Use of pre-initialized global lists for languages

* Fixes bugs with lazy holders
2017-05-05 15:12:27 +02:00
Robustin
ad19802a6d fucking hell im so done with this PR 2017-05-03 20:03:43 -04:00
Robustin
5a98d90b5c Merge branch 'master' of https://github.com/tgstation/-tg-station into CMA6
# Conflicts:
#	code/datums/antagonists/datum_cult.dm
2017-05-03 12:28:16 -04:00
oranges
054e280920 Merge pull request #26686 from Robustin/betterHUD
Flushes Ling & Alien HUD info with the edge of the screen
2017-05-03 11:42:20 +12:00
Robustin
3423cbeba5 Finally working again 2017-05-02 19:25:49 -04:00
AnturK
c8b67b49e0 Locked inventory slots are now indicated. (#26768) 2017-05-02 08:56:12 -06:00
Joan Lung
82c20c0bc6 Clockcult component generation will automatically focus on components needed to activate the Ark (#25596)
* Clockcult component generation will focus on components needed to activate the Ark

* I=/=i

* whoops
2017-05-01 11:50:01 -06:00
Robustin
4103871708 Merge branch 'master' of https://github.com/tgstation/tgstation into CMA4
# Conflicts:
#	code/datums/antagonists/datum_cult.dm
#	code/game/gamemodes/cult/cult.dm
#	code/modules/mob/living/simple_animal/constructs.dm
#	icons/mob/actions.dmi
2017-04-30 16:36:36 -04:00
Robustin
4a4c2a498c Big finalized update 2017-04-30 16:30:35 -04:00
Robustin
498559db33 Cult Construct Non-Balance Update (#26598)
* Adds Construct HUD

* Update _defines.dm

* Construct health icons

* Update tgstation.dme

* Update constructs.dm

* construct glow

* Nightvision

* Add files via upload

* Update constructs.dm

* HUD fix

* updated icon names

* Update screen_objects.dm

* here goes nothing

* Throwing code at the wall and seeing what sticks

* Update constructs.dm

* Update constructs.dm

* Update constructs.dm

* wew

* empty space memes

* Update constructs.dm

* Update and rename constructs.dm to construct.dm

* Update construct.dm

* Filename memes

* Update constructs.dm

* update

* Finished and tested
2017-04-29 14:10:41 +12:00
Robustin
06c3116c2d Still debugging 2017-04-28 19:41:57 -04:00
Robustin
e1215371b9 Update _defines.dm 2017-04-28 14:47:39 -04:00
Robustin
3ffaead7cf Cult Master 2017-04-26 20:14:42 -04:00
Cyberboss
5ace376e4a Initialize Refactor (#25981)
Shouldn't break anything, stops warning spam, logs errors qdel style at the end of the game.

Initialize now expects a hint to be returned, one of:
INITIALIZE_HINT_NORMAL - Does nothing, returned by the root proc
INITIALIZE_HINT_LATELOAD - Call atom/proc/LateInitialize
INITIALIZE_HINT_QDEL - Calls qdel on the atom

LateInitialize currently defaults to the old re-calling behavior so there should be no issues with that.
Things that didn't return a hint or fucked up somehow will be logged less loudly than they were before

No more world start warnings!
2017-04-27 09:02:29 +12:00
MrPerson
ff3f84ab81 Replaces /image with /mutable_appearance, where appropriate (#26518)
In cases where you're creating an image to use as an overlay, it makes more sense to use a mutable_appearance if you can. The image will create a static appearance for not just the image but also each intermediate step if you change vars along the way. The mutable appearance avoids this unnecessary and expensive process. The only situation that requires an image instead of a mutable_appearance is if the overlay is supposed to be directional. MA's ignore direction while images don't. I dunno why, probably another BYOND-ism.

I added a convenience function, mutable_appearance(), designed to emulate image(). Also went ahead and set the default plane of /mutable_appearance to FLOAT_PLANE because it's fucking 0 by default.

Several overlays that were image() calls were changed to just text strings when I could. overlays += "string" has the same result as overlays += image(icon, "string") and saves a proc call.
2017-04-25 12:15:16 +02:00