Commit Graph

477 Commits

Author SHA1 Message Date
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
Tigercat2000
1ff3d20075 Last fixes 2015-12-17 18:38:13 -08:00
Tigercat2000
b085bf8bab Shuttle README, Wrap up dev tools. 2015-12-17 16:49:19 -08:00
Tigercat2000
91a9ab4683 Nuke the rest of bay shuttles. Fuck you, Bay shuttles. 2015-12-17 15:18:10 -08:00
Tigercat2000
544908c778 Shuttles: Vox Skipjack + Win button 2015-12-13 13:13:39 -08:00
Tigercat2000
0e3c1f7fc6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-13 09:25:04 -08:00
ZomgPonies
4922d60054 Adds ice tiles to cold pressurized turfs 2015-12-08 01:24:38 -05:00
Tigercat2000
ebcc4edcef Shuttles: P2, Escape Pods n' Fixes 2015-12-07 14:27:37 -08:00
Tigercat2000
c3f476f62c Supply shuttle, initial_move() fixes, dock fixes
Supply has been almost completely replaced by -tg-'s system.

No fancy UI, unfortunately, but modifying bay's directly was not possible.
2015-12-04 21:48:40 -08: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
Fox-McCloud
d795380caf Crew Transfer No Longer Blocked by Security Level 2015-11-18 00:10:07 -05:00
Tigercat2000
aa86c85b98 Add config option to disable same-CID popup "YOU'LL BE BANNED STOP IT"
This is seriously fucking annoying when testing local changes. Only a
config option instead of being removed completely because I am actually
going to go fucking insane without this being gone.
2015-11-01 20:34:37 -08:00
Tigercat2000
206f7079df Clean up mob code a bit
Does the following:
 - Cleans up how gravity works, a little bit
 - Pushes duplicated procs for slimes/xenos/humans up to carbon/Life()
 - carbon/Life() is now a thing, it handles the non-special stuff for all
   carbons
 - Mob controller no longer ticks a seperate entity, mob_master is now
   just a reference to the mob process, which ticks.
2015-10-27 06:19:24 -07:00
Fox-McCloud
cd3d97c017 removes unused machine profiling 2015-10-19 03:49:36 -04:00
Fox-McCloud
c3440b07be Supply Controller Refactor 2015-10-14 05:11:02 -04:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Markolie
2f9fd64a55 Hotkey/interface update 2015-09-30 01:02:58 +02:00
Markolie
95fa836d68 Various fixes 2015-09-26 04:51:36 +02:00
Markolie
1a2459de0a check_rights/R_MOD update 2015-09-24 04:35:04 +02:00