Commit Graph

362 Commits

Author SHA1 Message Date
TullyBurnalot
13c6df5b38 Appendix-less mobs cannot contract appendicitis 2016-08-28 14:37:08 +01: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
TheDZD
5af653f3ea Merge pull request #5394 from Fox-McCloud/clientless-mobs
Virus Outbreak and Appendicitis Clientless Blacklist
2016-08-10 18:21:29 -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
Fox-McCloud
e1179c339d Virus Outbreak and Appendicitis Clientless Blacklist 2016-08-09 08:05:12 -04: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
Isaac Erwin
f2c1c7406d Various grammar/spelling fixes 2016-08-05 18:43:33 -04:00
Crazylemon64
7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Fox-McCloud
a886b6a01f Wormhole Event Fixup 2016-08-02 23:17:33 -04:00
Krausus
dba8af8ab5 Removes dels and unused code that contains dels 2016-08-02 01:33:19 -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
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00
Fox-McCloud
62a780220d More Overload Lighting Performance 2016-08-01 15:29:47 -04: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
FreeStylaLT
45be3e37bb Adds electrical grid check to random events. 2016-07-21 22:46:16 +03:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Twinmold93
15ca46919e Rogue Drones Message Now NSV Instead of NMV (#4716)
In the lore, it's the NSV Icarus, not the NMV Icarus. Just a
working/grammar fix.
2016-06-19 13:25:49 -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
8ff32f4566 fixes 2016-04-18 22:53:31 -04:00
Fox-McCloud
fe170db7bb part 3 2016-04-17 10:35:10 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Tigercat2000
c72cc9606e Merge remote-tracking branch 'upstream/master' into to_chat
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
2016-04-05 15:54:48 -07:00
TheDZD
2546c290f4 Merge pull request #4095 from Fox-McCloud/mob-spawn-refactor
Simple Animal Spawn Refactor
2016-04-05 18:34:34 -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
b7afdec18c defines 2016-04-04 17:01:03 -04:00
Fox-McCloud
3bd37ec757 Simple Animal Spawn Refactor 2016-04-04 00:30:10 -04:00
Aurorablade
eb4ddb247d MeteorOps Tweaks 2016-04-03 01:54:51 -04:00
Fox McCloud
752d106bef Merge pull request #4067 from tigercat2000/510staging
Merge branch 'byond510' into master
2016-04-02 22:44:00 -04:00
Fox McCloud
13200e7c62 Merge pull request #4049 from Aurorablade/FethasStaph
Fethas Carnival of Horrors:Fethas Please Stop
2016-04-01 20:43:06 -04:00
Tigercat2000
519992b5a9 Merge branch 'byond510'
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
2016-04-01 14:15:44 -07:00
TheDZD
c659cca883 Merge pull request #4046 from Fox-McCloud/full-add
Fully Re-Activates Disease1
2016-04-01 15:42:02 -04:00
Aurorablade
a278328312 reworked the event 2016-03-31 14:03:05 -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
Aurorablade
ebea66f7dd heeeeeheeee 2016-03-31 02:12:57 -04:00
Aurorablade
0feac81bba TeeHee 2016-03-31 02:10:27 -04:00
Fox-McCloud
d2907e3631 oh hell 2016-03-30 22:52:36 -04:00
Fox-McCloud
560eb17f9d Fully Re-Activates Disease1 2016-03-30 22:31:59 -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
7c3667ecb8 Adds PDA chatroom 2016-03-18 16:45:12 -04:00
Tastyfish
0e0225b1ee Fixes several midround antag assignments not asking ghosts first 2016-03-07 03:03:45 -05:00
Tigercat2000
0c9a469f2c 510: HUD, Flash Refactor, Rip out unused pain system 2016-02-28 18:09:43 -08:00
Tastyfish
a8f9ea2086 pda refactor 2016-02-12 03:24:21 -05:00
Crazylemon64
5e403b49ec Add's DZD's tweak 2016-02-02 13:50:41 -08:00
Crazylemon
7795c77abf Tweaks chances 2016-02-01 12:10:08 -08:00
Crazylemon64
1d920c58e8 Makes borer more likely to occur 2016-02-01 11:42:30 -08:00
Fox-McCloud
243fae96c6 flag split 2016-01-27 16:36:43 -05:00