Commit Graph

5039 Commits

Author SHA1 Message Date
Markolie 9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Markolie 0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
Markolie 71319538df Vending machine overhaul, teleporter area fix, add events to status tab 2015-02-13 15:27:42 +01:00
DZD f1bca4a471 Changeling Status Tab Update
- Removes genetic damage time from Changeling status tab, as it no
longer reflects genetic damage accurately (EG: some powers are capped at
only below 20 genetic damage, others less).
- Changeling status tabs shows the amount of genomes absorbed.
2015-02-12 19:54:46 -05:00
Markolie 493be57db3 Update one click antag panel 2015-02-13 01:12:41 +01:00
DZD 723dc2ad98 ABSTRACT flag addition & handling
- Adds ABSTRACT flag to relevant items, removes abstract var.
- Adds checks for ABSTRACT where relevant.
- Also removes extra define of golem gas mask.
- Adds NODROP to changeling mutations so I don't have to do that later.
2015-02-12 18:49:26 -05:00
DZD a4cda9287f Merge with upstream/master 2015-02-12 16:43:01 -05:00
Markolie 4e2694cc03 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-12 19:11:35 +01:00
Markolie 3f80f66411 Simplify get_candidates, minor adjustment to antag ages 2015-02-12 19:09:05 +01:00
Fox-McCloud 2f965955ad Merge pull request #288 from TheDZD/changeling
Minor Traitor/Ling Tweaks/Fixes [BUGFIX] [BALANCE]
2015-02-10 21:37:15 -05:00
Fox-McCloud c2f84b67f0 Merge pull request #279 from Markolie/master
[BUGFIX] Add report_alerts variable to areas, zeroth law fix, cameranet code update
2015-02-10 21:35:30 -05:00
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Markolie a7ab903b4e And another AI fix 2015-02-10 23:34:17 +01:00
Markolie 6f6338cea4 Fix AI eye invisibility 2015-02-10 23:30:16 +01:00
Markolie 76911cc710 Warning fix 2015-02-10 17:30:30 +01:00
Markolie 97b75276fa Fix robot tracking 2015-02-10 17:26:35 +01:00
DZD 72ef4f38d5 Fixes Runtimes
Fixes runtimes with Assume Direct Control from View Vars, and observing
from the main menu. Morgue sprite code is the cause of both runtimes,
and this may break morgue tray sprites.
2015-02-10 11:25:07 -05:00
Mark van Alphen 2291981c15 Rename Fox.dm to fox.dm
For some reason this didn't stick
2015-02-10 17:16:32 +01:00
Markolie 64fe9e8600 Remove legacy viewpoint code, move back to Bay's and /tg/'s system 2015-02-10 17:02:27 +01:00
Markolie c507158b8f Camera code update, fix runtime 2015-02-10 15:42:47 +01:00
Markolie 3a4679bce7 Remove zeroth law with own board 2015-02-10 03:06:43 +01:00
DZD 4e93cc5203 Merge with upstream/maser 2015-02-09 18:22:19 -05:00
Markolie c2058c4a9d Update our /Topic code to prevent exploits 2015-02-09 18:22:22 +01:00
Markolie 354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/rechargestation.dm
2015-02-09 16:15:00 +01:00
Markolie 7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Fox-McCloud 857ca4c3bd Merge pull request #265 from Artorp/DisabilityFixes
Disability fixes
2015-02-09 00:23:01 -05:00
Markolie d10451c567 Fix a bunch of runtimes 2015-02-09 04:03:20 +01:00
DZD 4a751c6846 Merge with upstream.
Yay, merge conflicts!
2015-02-08 19:45:23 -05:00
DZD de9accc64d TG Changeling Port
This would've been multiple commits, but I kept forgetting to ACTUALLY
commit things. Changes logged in the PR.
2015-02-08 19:42:01 -05:00
Markolie 8fae0f029f Accessory overhaul 2015-02-08 14:29:10 +01:00
Artorp 69f5776aee Disability fixes
- Disabilities properly updated when new player is made

- Fixed epilepsy disability not linked to proper SE block
2015-02-08 14:20:57 +01:00
Fox-McCloud af78338a99 Nerfborgs 2015-02-08 00:22:13 -05:00
Fox-McCloud 4d89f5b086 Merge pull request #256 from Artorp/MorgueChanges
Morgue indicator changes
2015-02-07 12:29:05 -05:00
Artorp 1516f73f6c Comment removed
whoops
2015-02-06 15:22:37 +01:00
Artorp c616b42f67 Morgue indicator changes
- Fixed indicator not updating when clients log in/out
- Indicator added for when ghost can be cloned but not inside corpse
- Morgue now has a sprite for when a note is added to it
2015-02-06 15:07:15 +01:00
Fox-McCloud fb70920bc3 Merge pull request #254 from Markolie/master
Bug fixes, latejoining additions
2015-02-05 20:26:20 -05:00
Markolie 09047962de Include missed file 2015-02-05 14:58:22 +01:00
Markolie 36f5bd0c52 Add AI latejoining, fix Ofitser again, blob damages pods 2015-02-05 14:58:12 +01:00
Markolie 86dd7782d5 Add cyborg latejoining 2015-02-05 14:27:39 +01:00
Markolie 95679c01bb Bug fixes 2015-02-05 12:55:18 +01:00
Fox-McCloud fd23cc9861 Out of Time 2015-02-03 01:12:00 -05:00
Markolie c4f11b6693 Extra jobban checks 2015-02-01 16:38:17 +01:00
Markolie 2a1e9931a6 Add shuttle stranding 2015-02-01 16:05:43 +01:00
Markolie 8fb90212b8 Blob event fixes, toggle preferences age check, jobban check 2015-02-01 14:19:11 +01:00
Markolie d9cf2a8bbe Simple animals and turrets will now attack pods 2015-01-31 21:25:46 +01:00
Markolie 409dd8cfce Fix some oversights 2015-01-31 19:54:24 +01:00
Markolie c520856716 Additional jobban options, minimum account age for antags 2015-01-31 19:48:48 +01:00
Markolie 56cd293f4b Unused/WorkInProgress folder cleanup 2015-01-31 16:40:29 +01:00
Fox-McCloud c3b0df0ef4 Merge pull request #241 from Fox-McCloud/Dismemberment-Fixes
Dismemberment Fixes
2015-01-31 03:29:35 -05:00
Fox-McCloud 74bbb57a41 Dismemberment Fixes 2015-01-31 03:14:26 -05:00