Commit Graph

446 Commits

Author SHA1 Message Date
TheDZD
015af5519e Merge pull request #4391 from Fox-McCloud/objectives
TG Traitor Objectives Assignment
2016-05-10 22:41:49 -04:00
Fox-McCloud
a40460a365 TG Traitor Objectives Assignment 2016-05-07 22:28:57 -04:00
Tastyfish
82a9612653 Some math, mob helper/ one-liner optimizations 2016-05-06 04:38:59 -04:00
Tastyfish
7c85fc71eb Fixes timer runtimes 2016-04-30 07:00:56 -04:00
Tastyfish
3b59d2cd15 Defers pipenet and powernet rebuilds upon destruction of pipes and cables so explosions are faster 2016-04-29 23:42:47 -04:00
TheDZD
dc289611bc Merge pull request #4230 from Tastyfish/minornp
Minor fix to npc controller
2016-04-17 18:52:20 -04:00
Tastyfish
dcbdc4aa56 Minor fix to npc controller 2016-04-17 17:05:59 -04:00
Tastyfish
0820c03a18 Removes unnecessary extra stuff I did, makes bot radios cleaner 2016-04-16 18:36:21 -04:00
Tastyfish
178912db73 Makes the startup time significantly faster 2016-04-16 00:58:20 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs
Ports SNPCs
2016-04-11 20:44:50 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Tigercat2000
dd79aaa967 Merge remote-tracking branch 'upstream/master' into to_chat
Conflicts:
	code/game/machinery/door_control.dm
2016-04-05 21:10:36 -07: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
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
b2d9c2e6a9 Fixes mulebots killing passenger, bot tweaks 2016-04-03 15:39:54 -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
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
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
Tigercat2000
9854f48ca9 Assault Pods & Fixes
Fixes:
 - Lighting system bandaid: Lighting overlays can't go below 0 lum ever
 - -tg- shuttles now use changeTurf() and forceMove() appropriately
 - forceMove() actually bothers to update lighting now
 - Fixed teleportlocs including prohibited areas. Sorry wizards, no more
   area teleporting to Central Command.

Misc changes:
 - Moved the emergency shuttle stuff to the modules/shuttles/ folder
 - Moved the cargo shuttle stuff to the modules/shuttles/ folder

Features:
 - Added nukeops assault-pod. Nuke ops may purchase a destination setter
   for 30 telecrystals.
   The assault pod is a shuttle, equipped with 8 turrets that use
   weakbullet3. When an area is selected, a destination will be randomly
   placed in one of the turfs in that area. The pod will gib anyone
   standing in the area where it lands, and overwrite any turfs.
2016-03-19 14:45:45 -07:00
Fox McCloud
0645119e8c Merge pull request #3818 from Crazylemon64/better_sci_objectives
Modifies science and robotics objectives
2016-03-11 00:21:17 -05:00
Crazylemon64
82edb1269c No no no debug prints 2016-03-09 20:54:06 -08:00
Crazylemon64
f2e21ab267 Makes everything work 2016-03-09 20:43:13 -08:00
Crazylemon
21fbad04bb Fixes the RIPLEY objective, and changes R&D's objective
to ship disks to cargo
2016-03-09 13:36:18 -08:00
Fox-McCloud
bc639a357c more sounds 2016-03-08 22:35:31 -05:00
Tastyfish
83396d41df Removes btime dependency, makes sleep check happen on Every SCHECK 2016-03-01 22:20:19 -05:00
Tigercat2000
0c9a469f2c 510: HUD, Flash Refactor, Rip out unused pain system 2016-02-28 18:09:43 -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
b55f79f754 Adds soda dispenser to beach bar. 2016-02-27 03:24:48 -05:00
Tastyfish
cb2989eea1 Gave the beach an edge instead of endless void. 2016-02-27 03:03:23 -05:00
Fox McCloud
bd527a5745 Merge pull request #3571 from tigercat2000/ircmods
send2irc Multi-Host upgrade
2016-02-12 18:07:41 -05:00
Tigercat2000
d6db130909 send2irc Multi-Host upgrade
Allows for send2irc to send to multiple hosts.
2016-02-11 11:24:30 -08:00
Fox-McCloud
412952e2c6 wait for it 2016-02-11 05:06:25 -05:00
Fox-McCloud
ba5433476e faster loop 2016-02-09 22:40:33 -05:00
Fox-McCloud
80ae2796b7 Ports TG's Timer Controller 2016-02-09 08:45:56 -05:00
Tastyfish
c714f14b28 Shuttle fixes 2016-01-30 22:29:42 -05:00
Tastyfish
ef79569075 Fixed continuous rounds 2016-01-30 20:33:45 -05:00
Tastyfish
306130ebed Optimizations for #3293 2016-01-20 18:02:14 -05:00
Tastyfish
895a0e8f45 Added cancellation to supply ordering inputs 2016-01-19 17:15:55 -05:00
Tigercat2000
b606a6d1fd Clean incorrect styling for the ++ operator 2016-01-02 10:46:01 -08:00
Fox-McCloud
c3d5311c32 no meta-gaming 2015-12-31 00:44:21 -05:00
Fox-McCloud
fb22f8f34c Cardboard Box Fix 2015-12-27 00:28:40 -05:00
Markolie
38dfc02c26 Prevent ordering while in transit 2015-12-22 16:39:08 +01:00
Markolie
56b83ffc98 Typo fix 2015-12-21 20:01:42 +01:00
Markolie
1195b5f90e Re-implement NanoUI cargo console 2015-12-21 19:56:36 +01:00