Commit Graph

168 Commits

Author SHA1 Message Date
TheDZD 42a5810de3 Merge pull request #4326 from Fox-McCloud/even-less-lag
Makes Explosion and Singulo Defer Based on CPU
2016-04-30 09:57:01 -04:00
Fox-McCloud 2d90585ecc Makes Explosion and Singulo Defer Based on CPU 2016-04-30 05:17:45 -04:00
IK3I 8d18ce19df Incorporates Suggestions for code format
Redoes get_damaged_organs() to use defines and flags instead of strings.
2016-04-29 21:43:19 -05:00
TheDZD c0ccc56969 Merge pull request #4288 from Fox-McCloud/door-wands
Ports Door Wands
2016-04-26 19:31:41 -04:00
Fox-McCloud d03a7ba7b5 fixes and defines 2016-04-26 00:51:24 -04:00
TheDZD 18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE
-tg- HUD styles
2016-04-25 19:57:59 -04:00
TheDZD cdc20258a1 Merge pull request #4212 from Tastyfish/bans
Cleans up special role jobbans
2016-04-25 18:34:37 -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
Fox-McCloud fe170db7bb part 3 2016-04-17 10:35:10 -04:00
Fox-McCloud f817351d2a part1 2016-04-16 10:40:21 -04:00
Tastyfish 127787aec5 Cleans up special role jobbans 2016-04-15 16:18:49 -04:00
TheDZD 341034e37d Refactors hostile mob code, unsnowflakes bears, panthers, and snakes
Also fixes some bee stuff.
2016-04-14 20:36:45 -04:00
TheDZD 985ab85aae Merge pull request #4188 from Fox-McCloud/diona-refactor
Diona Species Behavior Handling Refactor
2016-04-14 19:17:17 -04:00
TheDZD f1672d6ccb Merge pull request #4156 from Fox-McCloud/mining-bot-update
Mining Bot Updates
2016-04-14 19:10:26 -04:00
Fox-McCloud 5081e6d892 Diona Refactor 2016-04-12 23:54:12 -04:00
Fox-McCloud 5e1fa7f8e2 Mining Bot Updates 2016-04-10 22:15:36 -04:00
Tastyfish 7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
FalseIncarnate afec3ba8fd Conflict Fix 2016-04-05 19:28:14 -04:00
FalseIncarnate 8a558a7c96 Merge Conflict 2016-04-05 19:26:30 -04:00
FalseIncarnate 40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -04: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
Fox-McCloud b7afdec18c defines 2016-04-04 17:01:03 -04:00
Tigercat2000 b4eaf130b0 Merge remote-tracking branch 'upstream/master' into tgport-16569
Conflicts:
	.gitignore
2016-04-02 20:29:28 -07:00
Fox McCloud 752d106bef Merge pull request #4067 from tigercat2000/510staging
Merge branch 'byond510' into master
2016-04-02 22:44:00 -04:00
Tigercat2000 8e7c447646 Ports tgstation/-tg-station#16569, World Topic() changes
Full changes:
 - World Topic() is now standardized to use if("parameter" in topic_list)
   instead of an amalgamation of findtext() and if(topic == "parameter").
 - Comms password is now verified at the top of world/Topic() and sets a
   variable to true if it is present and correct.
 - "status" now returns extra information if the comms_password is
   provided and correct.

Misc changes:
 - Shuttle text has been standardized as a proc on mobile docking ports.
   This is used by status/supply displays and mob/Stat() for the -ETA- etc stuff.
2016-04-02 17:38:49 -07:00
Fox McCloud a42bcb53e3 Merge pull request #4061 from Aurorablade/AntagHudUpdates
Antag Hud updates
2016-04-02 04:13:20 -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
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
Fox McCloud d1765e0e14 Merge pull request #4019 from tigercat2000/disease1
-tg- disease1
2016-03-30 21:29:58 -04:00
Crazylemon64 7aa519723b Merge branch 'master' of https://github.com/Crazylemon64/Paradise into metal_foam_space_flooring 2016-03-28 23:13:43 -07:00
Crazylemon64 00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Tastyfish 08da2260a0 Ports tg's smooth progress bars 2016-03-28 04:24:26 -04:00
FalseIncarnate 112523086b Logic Gates WIP Commit 2016-03-28 00:53:21 -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
TheDZD 854420bc74 Merge pull request #3911 from KasparoVy/ipc-fbp-resolved
IPC-FBP Customization
2016-03-20 18:43:51 -04:00
Tigercat2000 009bef4420 Refactor allowed() proc. 2016-03-18 12:02:38 -07:00
KasparoVy 98285c0518 No longer, I hope. 2016-03-17 20:37:41 -04:00
Tastyfish 1bb98edc0d Refactors vampire abiliies to be spells 2016-03-10 07:01:31 -05:00
TheDZD 4e47626af7 Merge pull request #3767 from Tastyfish/silence
Tranquillité, Prospérité & Mimeré
2016-03-08 19:32:29 -05:00
Tastyfish d189d70f4a Adds tranquillite
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
2016-03-06 01:49:30 -05:00
Fox-McCloud 4d9627e986 Removes Halloss 2016-03-03 23:26:41 -05:00
Tastyfish 83396d41df Removes btime dependency, makes sleep check happen on Every SCHECK 2016-03-01 22:20:19 -05:00
Crazylemon64 a8f890bad1 Updates the buildmode tool to allow for better area generator testing 2016-02-29 07:09:00 -08:00
Tastyfish a8f9ea2086 pda refactor 2016-02-12 03:24:21 -05:00
Tastyfish c714f14b28 Shuttle fixes 2016-01-30 22:29:42 -05:00
Fox-McCloud 243fae96c6 flag split 2016-01-27 16:36:43 -05:00
Fox-McCloud 913922b408 Adds in Skeleton Race 2016-01-27 00:45:32 -05:00
Fox-McCloud a56fcfc0e1 just in case 2016-01-24 23:27:55 -05:00