Commit Graph

319 Commits

Author SHA1 Message Date
TheDZD
164810577d Merge pull request #4526 from CrAzYPiLoT-SS13/ohgodthisisold
Fixes an oldie
2016-05-30 11:57:10 -04:00
Fox-McCloud
25477b0bbf clean up 2016-05-29 22:05:20 -04:00
Matt
4f49c18cef whywouldyouleaveit 2016-05-28 21:45:21 +02: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
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
Aurorablade
72344f082d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BeepBeep 2016-03-18 20:59:01 -04:00
Aurorablade
2eaff84f42 mogjtbosdopm ues 2016-03-13 08:08:15 -04:00
Fox-McCloud
31217a058d Implements Changeling Headcrabs 2016-03-12 23:37:01 -05:00
Aurorablade
a653dfd69d god its late 2016-03-12 00:49:36 -05:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
bbac4006b5 fixc all the things. 2016-02-23 02:48:13 -05:00
Aurorablade
400ed30455 issue with identity transfer 2016-02-13 15:20:21 -05:00
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Fox-McCloud
243fae96c6 flag split 2016-01-27 16:36:43 -05:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Aurorablade
cc8f402a4d progress
xeno organ abiltys not working on insert (on non xeno mob)
Limb attachment for robot parts being stupid
2016-01-21 20:42:32 -05:00
Fox-McCloud
fb11acbf79 Implements Ling HUD 2016-01-20 22:38:26 -05:00
Aurorablade
51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Aurorablade
bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00
KasparoVy
eb47c80d75 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-30 18:16:17 -05:00
KasparoVy
6ba20458e5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
# Conflicts:
#	icons/mob/human_face.dmi
2015-12-27 18:42:59 -05:00
Crazylemon
23e8b1277f Wave 2 of tweaks, probably needs a little more
Ripped out the preferences_savefile.dm because it's obsolete and we
don't use it
2015-12-27 06:32:25 -08:00
KasparoVy
5f72fff880 Final Pass
Breaks Facial Hair updates into their own proc and puts facial hair on
its own layer.
Works through everything that calls update_hair with the intention of
updating facial hair and adds update_fhair
Fixes the sprite names and colouring on all 'facial' and 'body marking'
aspects.

Fixes/implements proper ID photo/preferences preview picture generation.

To do: Tail marking customization possible rework, gutting in the
meantime
2015-12-27 05:45:25 -05:00
Aurorablade
2146cc0d3d things
and stuff...gonna need to get to those merge conflicts eventually. also
purged all mention of internal_organs by name from the face of the
earth. we have get_int_organ now...i may need to tweak shit. oh and i
broke some things...
2015-12-26 17:34:38 -05:00
Aurorablade
4e1f63da7e wot 2015-12-25 01:05:47 -05:00
Aurorablade
1a70e9caf5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-24 00:17:26 -05:00
Aurorablade
046b0b997d almost.... 2015-12-23 11:40:16 -05:00
Aurorablade
4b7253befc commit so i can swap branches...
please note, anything further on changling may invovle updates to game
mode, so another pr. and yes with the brains its jut blocked from
prepare_eat() proc
2015-12-21 23:19:27 -05:00
Aurorablade
d75549fdd6 no more changling cyborgs
also added in some procs for as furture need...god i need sleep now.
2015-12-20 01:47:15 -05:00
Aurorablade
80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05:00
Aurorablade
52e43c4d2d good news everyone! It works! 2015-12-17 01:29:21 -05:00
Aurorablade
6eac1092bb hate the mask of narnar 2015-12-15 22:27:30 -05:00
Aurorablade
95d8b50345 hud_updateflag purge!
EXTERMINATUS BITCH
2015-12-13 17:16:14 -05:00
Aurorablade
aca9d31853 almossstttttt 2015-12-12 18:45:07 -05:00
Aurorablade
c590958f2d Hud refactor 2015-12-10 01:01:54 -05:00
Tigercat2000
b36a32b6b8 Gamemode cleanup x1
Changelog:
 - Enemy intercept (send_intercept()) completely nuked, it did not compile
   when I attempted to make it into a config option.
  - The intercept for blob() is retained and made into a custom proc for
    blob.
 - The constant variables 'waittime_l' and 'waittime_h' have been moved to
   /datum/game_mode, as they were defined on every gamemode with the same
   values.
 - rp-revolution.dm and anti_revolution.dm deleted. They do not compile,
   and are not included in the DME already.
2015-11-16 11:51:18 -08:00
Fox McCloud
57e5230add Merge pull request #2233 from Markolie/ShitStar
AStar/Datastructures update
2015-10-03 19:20:46 -04:00
Markolie
710d60c7bc Another update 2015-10-03 01:14:26 +02:00
Markolie
e9188f7f38 AStar update 2015-10-01 20:18:05 +02:00
Fox McCloud
15c9873cdf Merge pull request #2224 from Markolie/shitcode
Strange reagent fix, tod --> timeofdeath
2015-09-29 18:25:04 -04:00
Markolie
8b2e62fc10 Strange reagent fix, tod --> timeofdeath 2015-09-29 22:03:04 +02:00