Commit Graph

1716 Commits

Author SHA1 Message Date
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
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
Fox McCloud
558d3a82a2 Merge pull request #3967 from Crazylemon64/shoulda_added_notifications
Adds notification to admin ghost incarnation
2016-03-24 13:06:07 -04:00
Tastyfish
cd06bf07e0 Ports more sdql features from vg 2016-03-23 05:59:17 -04:00
Crazylemon64
8bd972c9af Adds notification to admin ghost incarnation 2016-03-22 21:55:54 -07:00
Fox McCloud
d616a862b3 Merge pull request #3941 from Tastyfish/sdqlcall
Adds src and usr to SDQL
2016-03-21 21:05:54 -04:00
Tastyfish
a18cb8c21f Adds marked, [0x] refs, and hex numbers to SDQL 2016-03-20 22:13:57 -04:00
TheDZD
854420bc74 Merge pull request #3911 from KasparoVy/ipc-fbp-resolved
IPC-FBP Customization
2016-03-20 18:43:51 -04:00
Tastyfish
1c3a8b5263 Adds src and usr to SDQL 2016-03-20 17:20:12 -04:00
Tastyfish
87745262f3 Fixes SDQL's CALL 2016-03-20 15:19:25 -04:00
Fox McCloud
0d24763e35 Merge pull request #3920 from Crazylemon64/cleaner_dna_application
Makes DNA swapping methods more reliable and other appearance tweaks
2016-03-18 21:37:20 -04:00
Crazylemon64
d748ef23b8 Makes DNA swapping methods more reliable
- Makes heads keep hair on removal
- Amputated limbs from a DNA-injected individual now will keep their
  appearance of the DNA-injected person
- Wounds will now vanish on their own now
- Admins now have an "incarnate" option on the player panel when viewing
  ghosts for quick player instantiation
- Fixes a runtime regarding failing a limb reconnection surgery
- Copying a client's preferences now overrides the previous mob's DNA
2016-03-17 23:07:45 -07:00
KasparoVy
98285c0518 No longer, I hope. 2016-03-17 20:37:41 -04:00
Tastyfish
e8cd1226cb Makes toggling debug logs actually save 2016-03-16 17:20:24 -04:00
Fox McCloud
b5df688605 Merge pull request #3744 from Crazylemon64/human_icons_tweak
Changing a person's appearance now works better
2016-03-03 20:38:18 -05:00
Fox McCloud
60b0d6f2fe Merge pull request #3639 from Crazylemon64/matrix_and_path_editing
Adds matrix and path editing to the variable viewer
2016-03-03 20:31:25 -05:00
Crazylemon64
7e510dfdb6 Changing a person's appearance now works better
Also fixes some problems on changing gender
2016-02-29 19:31:29 -08:00
Crazylemon64
a816e0e0aa Makes buildmode quit if you switch to another mob, to prevent tragedy 2016-02-29 08:09:47 -08:00
Crazylemon64
a8f890bad1 Updates the buildmode tool to allow for better area generator testing 2016-02-29 07:09:00 -08:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Tigercat2000
5294b4c223 510: Remove BYGEX completely, remove autoconvert notes
notes (never used + uses bygex specific things)
2016-02-28 11:21:30 -08:00
Tastyfish
7b225badbf Adds super stealth Big Brother mode 2016-02-23 03:20:40 -05:00
Tastyfish
492ed2f16e Corrects CentComm spelling 2016-02-22 04:39:10 -05:00
Crazylemon64
8a7a17b8e6 Adds matrix and path editing to the variable viewer 2016-02-19 01:20:01 -08:00
Crazylemon64
b71905dbb1 Updates the admin's buildmode to use "plasteel" floor 2016-02-12 18:43:57 -08:00
TheDZD
c773f2a010 Makes adminhelp colors slightly less blinding 2016-02-11 18:21:27 -05:00
TheDZD
07c63d7848 Fixes DZD being colorblind
I accidentally made mentorhelps the same color as mentor OOC, whoops.
2016-02-10 20:09:56 -05:00
TheDZD
5a8ffbd198 Jobban Tweaks 2016-02-09 16:35:30 -05:00
TheDZD
e9d9e3b3e6 Colors! 2016-02-08 21:25:14 -05:00
TheDZD
ba8a2f3247 Renames adminhelp categories 2016-02-01 22:05:08 -05:00
Fox McCloud
f68d36fd74 Merge pull request #3379 from TheDZD/literally-hitler
Removes Fun and Memes (Not a Changelog this Time)
2016-01-25 18:44:36 -05:00
TheDZD
34cf55dcef Removes fun, removes memes 2016-01-24 18:39:59 -05:00
TheDZD
2e6b7c3c5b Enables control_freak
Still allows for custom skins and macros. control_freak is disabled for admins.
2016-01-24 14:51:54 -05:00
Fox-McCloud
f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
Fox-McCloud
1bd3da4521 Implant Refactor Part II 2016-01-17 20:03:41 -05:00
Tigercat2000
6d79878c6e Fix #3253, banning in lobby 2016-01-16 12:32:01 -08:00
SamCroswell
eb8b2cc09f Adds Fun 2016-01-07 15:08:12 -05:00
TheDZD
15170405d4 Makes IsBanned use text2num for CIDs
CIDs are text, not numbers, so this is necessary. Port of tgstation/-tg-station#13577, might finally sticky bans going haywire.
2016-01-03 11:56:39 -05:00
Tastyfish
72d2db27c4 Fixed Test Areas and added checking for too many apc's 2016-01-01 01:57:48 -05:00
Fox McCloud
e67450d56d Merge pull request #3025 from Crazylemon64/infinite_antags
Infinite antag tags
2015-12-30 13:52:41 -05:00
Tigercat2000
9cb84e83ca Clean old shit, delete old files, move files, mrowl 2015-12-27 15:58:41 -08:00
Crazylemon
4133e98dfe Port of RemieRichard's infinite antag system
This is just the first chunk, of fixing around the be_special flag stuff
It will probably break everything as-is
2015-12-25 22:51:02 -08:00
Fox-McCloud
bbf3b528c4 Field Generator Refactor+Fixes 2015-12-22 13:40:53 -05:00
Tigercat2000
0e3c1f7fc6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-13 09:25:04 -08:00
Tigercat2000
3d71483372 /vg/ / -tg- asset_cache
Port of -tg-'s port of /vg/'s asset cache
Funny thing is, this actually replaces an old version of /vg/'s asset
cache we already had
IT'S A PORT OF A PORT REPLACING A PORT
POOOOOOOOOOOOOORTCEPTION

Basically, gets rid of the 30-40 second interface lag when you first join,
via *mumblemumble* MAGIC!

Also moves a few nano files around.
2015-12-12 21:25:04 -08:00
Fox-McCloud
1de87cf143 ASS DAY ALL DAY EVERY DAY TODAY IS ASS DAY 2015-12-09 19:27:41 -05:00
Fox-McCloud
5a1528a76a Sticky Ban Fix 2015-12-09 19:16:16 -05:00
Tigercat2000
356835aa99 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
Conflicts:
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/malfunction/malfunction.dm
	code/game/gamemodes/revolution/revolution.dm
	code/modules/admin/verbs/randomverbs.dm
2015-12-03 11:03:01 -08:00
Tigercat2000
e60799474b tgshuttles unfinished 2015-12-03 10:59:06 -08:00
Tastyfish
f839b43bcc Merge remote-tracking branch 'origin/inputfix' into inputfix
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/game/dna/genes/vg_powers.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/economy/EFTPOS.dm
	code/modules/mob/living/silicon/robot/life.dm
2015-11-30 22:44:55 -05:00