Commit Graph

171 Commits

Author SHA1 Message Date
Fox McCloud
d51834cbef Merge pull request #5737 from Crazylemon64/maroon_fix
Maroon now works as intended
2016-10-02 10:51:51 -04:00
Crazylemon64
a93663ac91 Maroon now works as intended 2016-10-01 22:58:16 -07:00
FlattestGuitar
503287d89a adresses things 2016-09-30 17:10:26 +02:00
Mieszko Jędrzejczak
56d56ffe7f ckeyless humans don't get to be shot 2016-09-26 17:43:57 +02:00
Fox-McCloud
3dcc4bdecd Removes Mutiny 2016-08-12 22:44:11 -04:00
Fox-McCloud
41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -04:00
Tigercat2000
58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm
2016-08-10 14:16:42 -07:00
Crazylemon64
1d7b94d71a I thought I fixed this 2016-08-08 14:18:43 -07:00
Tigercat2000
0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Conflicts:
	code/game/gamemodes/objective.dm
2016-08-08 06:21:02 -07:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time!
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2016-08-07 23:42:02 -07:00
KasparoVy
7b502a0989 get_turf instead of snowflake_check 2016-08-06 16:10:06 -04:00
KasparoVy
d6fc1c7096 Fixes Accidental Greentext for Maroon and Redtext for Assassination Objectives.
If you had the maroon objective as a traitor and your target was in any
sort of locker on the shuttle when it docked, it would give you green
text.

Maroon objectives now check if the target's in a locker and, if so,
checks the locker's location in order to correctly evaluate objective
completion.

If you had the assassination objective as a traitor and you killed them,
yet they were on a Z-level greater than the Derelict, it would give you
red text.

Assassinations are now location insensitive.
2016-08-06 15:37:27 -04:00
Tigercat2000
9f3cdb43f7 special_role/objective refactor
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
2016-08-01 21:29:19 -07:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Twinmold
ed27fd3799 total += kills
Uses byond's simplier form... Damn Lua code is stuck in my head...
2016-07-22 07:35:24 -05:00
Twinmold
81c55b666d Vox Raider Check Kills for Inviolate
Effectively, adds the check that makes it so you aren't allowed to kill
(many, at least) under the Inviolate. Doesn't check for deaths in the
server itself, only kills in the raiders minds, which the original code
failed to do by adding all deaths to voxkills. As we currently have,
it's a auto-complete objective, which is just a poor fix to the original
issue.

```var/vox_allowed_kills = 3``` gives them a little leeway, but can
easily be changed to any acceptable number.

🆑 Twinmold
Tweak: Vox Objective 4 now calculates the kills vox raiders actually
have, instead of always complete.
/🆑
2016-07-22 06:35:10 -05:00
Fox McCloud
a28ae804b9 Merge pull request #5086 from FreeStylaLT/assholewizards
Makes Wizards get only a special "fuck their shit up" objective
2016-07-18 20:03:57 -04:00
FreeStylaLT
deccfd6a24 Replaces hijack with an open-ended objective to wreck some shit up 2016-07-17 16:40:54 +03:00
Kyep
2f66464726 Prevents objectives targeting clientless mobs
Fixes bug where clientless mobs (e.g: gateway NPCs) can be made into
objective targets.
2016-07-16 20:21:12 -07:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
LittleBigKid2000
7d5d29d610 Rewords various objectives and makes 'Follow the inviolate' always succeed (#4648)
* Rewords various objectives, makes 'Follow the inviolate' always succeed.

* Fixes the capitalization of NanoTrasen

* Fixes inviolate objective so that admins can make it fail, hopefully

* Fixes the thing

* Re-reworded AI hijack objective
2016-06-15 06:32:45 -04:00
monster860
42639bcab5 Traders Event (#4016)
* Traders Event

* lien notes

* Fixes indent

* Gets rid of things Fox doesn't like.

* how did that get deleted

* Get rid of things maintainers don't like

* Adds some crates to the shuttle, and a recall console to the base.

* EVENT_LEVEL_MAJOR, and make it weight 0 (out of rotation)

* line nutes
2016-06-11 12:47:20 -04:00
Fox-McCloud
eb653a68c8 Can Deconvert Mindslaves 2016-06-06 10:32:57 -04:00
Fox-McCloud
22cb6d960c debrain 2016-05-10 22:27:12 -04:00
Fox-McCloud
a40460a365 TG Traitor Objectives Assignment 2016-05-07 22:28:57 -04:00
Tigercat2000
e105450a16 fix hijack too 2016-01-14 14:38:39 -08:00
Tigercat2000
9baf614f82 I hate objectives 2016-01-14 13:55:42 -08:00
Tigercat2000
b606a6d1fd Clean incorrect styling for the ++ operator 2016-01-02 10:46:01 -08:00
Tigercat2000
12911463e7 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
Conflicts:
	code/game/gamemodes/objective.dm
2015-12-17 18:46:50 -08:00
Fox-McCloud
3db762597c actual fix 2015-12-17 20:00:29 -05:00
Fox-McCloud
a9ad488b7a Fixes Hijack Objective 2015-12-17 02:31:07 -05:00
Tigercat2000
c3f476f62c Supply shuttle, initial_move() fixes, dock fixes
Supply has been almost completely replaced by -tg-'s system.

No fancy UI, unfortunately, but modifying bay's directly was not possible.
2015-12-04 21:48:40 -08:00
Tigercat2000
e60799474b tgshuttles unfinished 2015-12-03 10:59:06 -08:00
Fox-McCloud
a404929d16 Multiverse Sword 2015-10-21 23:59:59 -04:00
Markolie
1a2459de0a check_rights/R_MOD update 2015-09-24 04:35:04 +02:00
Fox-McCloud
8e88ceabd1 fix 2015-09-08 22:25:21 -04:00
Fox-McCloud
380d085f28 ERT exception 2015-09-08 20:12:28 -04:00
Fox-McCloud
b674f247b8 Hijack Objective Rework+Fix 2015-09-08 16:44:51 -04:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Markolie
7dbd45857a Fix cult sacrifice objective 2015-07-26 06:06:04 +02:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud
a9f3eab669 pass 2+fix 2015-07-07 00:58:34 -04:00
Fox-McCloud
97ae66260c Objective Tweaks 2015-06-18 02:04:44 -04:00
Krausus
716d146ddd Makes escape objectives fail if restrained
Also returns the "alive and free" wording to escape objectives.
2015-06-04 13:14:44 -04:00
Krausus
f72c21b606 Fixes Escape Objective Issues
Escaping on pods will now work properly, and being handcuffed will cause
failure regardless of where you are.
2015-06-03 20:46:23 -04:00
Fox-McCloud
faa928c23c Clarifies the Escape Objective 2015-06-01 23:42:35 -04:00
Fox-McCloud
904c4c62c9 Removes Speciesist Objective 2015-05-23 03:25:44 -04:00
Krausus
cae8bd68bf Fixes exchange objectives, probably
This should at least fix the runtime spam
2015-05-19 14:25:38 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00