Commit Graph
268 Commits
Author SHA1 Message Date
Aurorablade 5a07759c97 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie 2017-01-11 23:41:06 -05:00
Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
2017-01-11 23:11:29 +01:00
Aurorablade c014e72979 AND YOU GET A PARENT CALL AND YOU GET A PARENT CALL AND YOU 2017-01-09 02:31:44 -05:00
Markolie 01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Fox-McCloud 7a55ec18fc Merge remote-tracking branch 'upstream/master' into food-rework 2016-12-05 12:40:32 -05:00
KasparoVy 14fdeadf78 Fixes an Issue with Cloned Vampires Losing Powers
Alright, so the root of the issue was how the vampire gamemode tracks
the owner of vampire stuff. This can be seen in line 197 of vampire.dm
that it tracks a body much like the mind datum does. However, before my
fix, this 'owner' fell out of date when a vampire got cloned. While the
vampire would get cloned, this owner variable would still refer to their
old body, and so stuff would break.

Now, it gets updated with the current body when the vampire gets cloned,
thus resolving the issue.
2016-12-03 21:56:25 -05:00
Fox-McCloud e134100164 Hunger Rework 2016-11-28 13:17:46 -05:00
Markolie 0fa43f7f41 Hopefully final magic fixes, and fixes the possessor 2016-10-25 23:32:35 +02:00
Markolie dbc73875d7 Fix spells, shadow/Diona QoL improvements (HUD icons) 2016-10-25 18:11:09 +02:00
Crazylemon64 6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie 514222b6d7 Fixes silicons not having their antag powers/antagHUD removed properly. Fixes traitors/abductors not having their antagHUD added at roundstart. 2016-10-09 16:36:09 +02:00
Crazylemon64 16dd4e9d21 Moves many uses of log_to_dd to log_runtime, to make the output
more visible at runtime, to someone who isn't watching DD first-hand
2016-08-24 09:55:19 -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
Isaac Erwin f2c1c7406d Various grammar/spelling fixes 2016-08-05 18:43:33 -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
Aurorablade 8df912f1d7 removes mask check 2016-07-29 17:15:16 -04:00
Aurorablade 0e858e3be5 i suck yous blood yaya? 2016-07-28 00:20:04 -04:00
Fox-McCloud 0a8dca713c proper ear damage proc 2016-07-21 04:24:12 -04:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TheDZD c9faca22a0 I accidentally Git 2016-07-01 15:06:53 -04:00
Fox McCloudandGitHub d5dcb90b99 Merge pull request #4832 from TheDZD/this-is-why-we-can't-have-nice-things
Tones Down Vampire Space/Chapel Burning
2016-07-01 13:59:32 -04:00
TheDZD e9e7f51718 Tones down vampire chapel/space burning 2016-06-30 11:48:56 -04:00
KyepandFox McCloud 3df13bac0d Fixes CC jobs being selected for antag roles (#4815) 2016-06-29 08:32:04 -04:00
TastyfishandFox McCloud cc1f984136 Fixes a bunch of to_chat runtimes (#4817)
* Fixes a bunch of to_chat runtimes

* also that one
2016-06-29 08:31:27 -04:00
tigercat2000andFox McCloud 732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
Fox-McCloud 3dd9a714fc Actually Fixes Traitor-Vamp 2016-06-19 09:05:13 -04:00
Fox-McCloud e6801a98e3 fixes and tweaks 2016-06-09 03:19:27 -04:00
Fox-McCloud 25477b0bbf clean up 2016-05-29 22:05:20 -04:00
Fox-McCloud 986b65fcfa Fixes TraitorVamp Chaplains 2016-05-19 02:34:38 -04:00
Fox-McCloud 45fc535203 A Few More Disease and Reagents 2016-05-05 00:46:04 -04:00
Fox-McCloud 4f5b4f4677 cleanup 2016-05-02 00:43:24 -04:00
Fox-McCloud ba154028c8 Game Mode Population Adjustments 2016-05-01 21:29:19 -04:00
Tigercat2000 d01eb6504e Fixes 2016-04-25 16:53:40 -07:00
Tigercat2000 66416ae5ec Merge remote-tracking branch 'upstream/master' into CRAZY_HUDS_AMIRITE
Conflicts:
	code/game/gamemodes/vampire/hud.dm
2016-04-21 20:31:58 -07:00
Tigercat2000 0f70e6810b -tg- OOP Hud Refactor
- Added 4 new HUD styles
 - Humans recreate their hud if they change their UI pref mid-game
 - Refactored how objects are added to the client screen
 - HUD's are now handled by subtype and mob/proc/create_mob_hud()
 - HUD visibility is no longer chained directly to the F12 button, it's a proc on HUD datums now
 - Mobs only create/destroy their HUD when necessary, not every Login()
 - Destroyed aim-mode, it didn't work and I couldn't make it work.
 - Renamed all of the screen1_x.dmi files to screen_x.dmi
 - Removed screen1.dmi, screen_gen.dmi now handles generic icons.
2016-04-21 20:28:08 -07:00
Tastyfish b798e7ef18 Fixes devamping in traitor panel 2016-04-21 19:58:49 -04:00
Fox-McCloud 2ec556e994 population adjustments 2016-04-08 20:10:39 -04:00
Fox-McCloud 4d58019d69 Traitor Vamp 2016-04-07 08:45:44 -04:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Fox McCloud a42bcb53e3 Merge pull request #4061 from Aurorablade/AntagHudUpdates
Antag Hud updates
2016-04-02 04:13:20 -04:00
Aurorablade 1db93aae1f Iseeytou 2016-03-31 22:33:29 -04:00
Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
2016-03-31 13:33:46 -04:00
Tigercat2000 ad2cf86898 -tg- disease1
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)

Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!

Changes:
 - Virus2 has been removed completely.
  - Some symptoms have not been readded. Aka, none of them have been
    readded, I just wanted to get this shit ported.
  - Virology has been updated slightly to mirror -tg-'s boxstation, as the
    virus2 machines are gone.
 - Welcome back, disease1
  - The centrifuge, vials, splicer, analyzer, growerthing, have all been
    replaced by the PanD.E.M.I.C. 2220
  - No symptoms have been completely removed; However, vision symptoms
    have been disabled pending byond 510, and genetics symptoms have been
    disabled until "when I figure out how to fix them".
  - Advanced Mutation Toxin now uses a disease, which turns people from
    species, to slime person, to slime. Slime people are instantly turned
    to a slime.
  - Diseased touch now give people appendicitis. Yes, they VANT YOUR...
    appendix.
  - Virology now has a fridge with the following in it:
    - Antiviral Syringes
    - 1 Rhinovirus culture
    - 1 Flu culture
    - 1 Bottle of Mutagen
    - 1 Bottle of Plasma
    - 1 Bottle of Synaptizine
  - A few more things, which I can't remember and can't look at while writing
    this commit. Sometimes, git hurts.

TODO:
 - Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
   work.
 - Fix genetics symptoms.
 - Give vampires a less shitty diseased touch.
 - Add appendicitis event.
 -
2016-03-27 21:24:00 -07:00
Tastyfish 25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
Tastyfish 89efc0b436 Fixes vamp antage hud not showing on round start 2016-03-18 02:07:04 -04:00
Tastyfish 1030cd1c4d Fixes admin removing vamp 2016-03-11 18:32:37 -05:00
Tastyfish b3e1abd884 Rejuventate spelling 2016-03-10 23:32:35 -05:00
Tastyfish 1bb98edc0d Refactors vampire abiliies to be spells 2016-03-10 07:01:31 -05:00
Tastyfish aed9859b9a Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so. 2016-02-28 01:11:36 -05:00