Commit Graph

138 Commits

Author SHA1 Message Date
Fox-McCloud
0ebd41b05e Fixes Slaughter Demon Bloodcrawl 2017-02-10 08:26:28 -05:00
Fox-McCloud
390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
Markolie
d6276ae978 Tiger's comments 2017-01-22 19:15:26 +01:00
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Markolie
0c01bbdad1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/game/gamemodes/cult/runes.dm
2017-01-12 16:24:26 +01:00
Aurorablade
155464b3a0 brain.exe had caused a critcal error and shut down 2017-01-07 01:03:46 -05:00
Aurorablade
0e35706c00 damn.... 2017-01-06 23:32:17 -05:00
Markolie
f4c4bfe288 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Markolie
5ace926e42 Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking. 2016-10-25 00:50:31 +02:00
Aurorablade
ec3d8c67a5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-19 01:01:19 -04:00
Aurorablade
811170f58f Updates 2016-08-18 04:08:31 -04:00
Ar3nn
b77d200603 ..() the second 2016-08-17 21:51:37 -04:00
Ar3nn
57b65483f9 ..() 2016-08-17 21:40:53 -04:00
Ar3nn
f702a9feae One more refactor 2016-08-17 21:10:49 -04:00
Ar3nn
ff467b984e Oops 2016-08-17 12:26:31 -04:00
Ar3nn
45e5e7b837 Come at it from a better angle 2016-08-17 00:30:25 -04:00
Aurorablade
47dc3a3051 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-16 02:23:20 -04:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Aurorablade
bb840f4dce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-07-21 23:56:34 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Aurorablade
a02a38b6e9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-06-21 07:42:29 -04:00
monster860
64ea452f20 Puts UI on it's own plane 2016-06-06 17:12:28 -04:00
Aurorablade
0ac1a0f759 code'sie has risen 2016-05-29 23:37:40 -04:00
Aurorablade
dc5a74f8f6 start of VG ports 2016-05-17 00:27:07 -04: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
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Tastyfish
85a58e59a6 Fixes to_chat script fuckery 2016-04-06 20:41:45 -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
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
Mieszko Jędrzejczak
135687fe7e Adds party grenades 2016-03-23 12:11:39 +01:00
Fox McCloud
166b3951b8 Merge pull request #3676 from Aurorablade/ThePutsaNewShadeOnThings
Fethas Carnival of horrors: A new shade for the detective
2016-02-26 20:02:41 -05:00
Tastyfish
4f3ce4ecbc Adds picture frames 2016-02-21 21:00:45 -05:00
Aurorablade
2c38d8fb61 yeah 2016-02-21 05:54:10 -05:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
Fox-McCloud
0e3a6a0857 map 2015-11-19 00:23:57 -05:00
Fox-McCloud
f43e21698c Updates 2015-11-18 23:17:31 -05:00
Aurorablade
f5f7c0cde9 might not be doing this right but eh 2015-11-02 21:58:15 -05:00
Aurorablade
600d351950 added in gib subtype 2015-11-02 20:54:34 -05:00
Aurorablade
f9d96ffbf1 WIP commit
still working on the camera thing..
2015-11-01 01:19:35 -04:00
Aurorablade
570cfbe566 Spoopy 2015-10-29 12:32:38 -04:00
Markolie
bff7a9a80c Replace _color with item_color 2015-10-05 19:55:14 +02:00
Tigercat2000
ec2b31e435 Nuke wheelchair snowflake shit, fix the delay 2015-09-28 12:59:44 -07:00
Fox-McCloud
480613208d Point Rework 2015-09-17 22:26:03 -04:00
Tigercat2000
0603f73232 Bay12 examine overhaul.
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
Fox-McCloud
54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud
cf6b4b0bb9 removed blood destroy 2015-07-08 01:50:22 -04:00