Commit Graph

88 Commits

Author SHA1 Message Date
Krausus
5b21a9a785 Improves voting system
- Makes votes show votes for winning option, or all options in a custom
vote
- Makes the voting panel automatically update
- Makes the voting panel use the browser datum
- Turns the voting notice into a clickable link
- Fixes admin status not properly being checked when the voting page is
refreshed
- Replaces vote process with a spawned loop in the vote controller
- Removes vote processing from the pre-game game ticker
2016-07-23 02:03:19 -04:00
Fox-McCloud
fc6514f5ba Merge remote-tracking branch 'upstream/master' into tg-weather 2016-07-16 11:07:43 -04:00
Fox-McCloud
01ffeb45fe more tweaks 2016-07-15 05:52:56 -04:00
Fox-McCloud
84f9a06881 probably not necessary 2016-07-14 04:47:11 -04:00
Fox-McCloud
5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -04:00
Crazylemon64
2c4d8e9b6a You can now load the cyberiad runtime-free 2016-07-03 15:36:38 -07:00
Crazylemon64
f2b48c7c67 You can now load the cyberiad with the map-loader 2016-07-02 22:50:45 -07: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
Tastyfish
dcbdc4aa56 Minor fix to npc controller 2016-04-17 17:05:59 -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
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
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
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
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
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
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