Commit Graph

945 Commits

Author SHA1 Message Date
tigercat2000
732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
monster860
42639bcab5 Traders Event (#4016)
* Traders Event

* lien notes

* Fixes indent

* Gets rid of things Fox doesn't like.

* how did that get deleted

* Get rid of things maintainers don't like

* Adds some crates to the shuttle, and a recall console to the base.

* EVENT_LEVEL_MAJOR, and make it weight 0 (out of rotation)

* line nutes
2016-06-11 12:47:20 -04:00
TheDZD
20ad49f9f9 Merge pull request #4383 from IK3I/Pod-Refactor
[Ready for Review] Pod refactor and fixes
2016-05-31 20:48:05 -04:00
monster860
06783d1063 Cyborg console HREF exploit 2016-05-23 17:00:34 -04:00
IK3I
ec9bc0ac2f Merge remote-tracking branch 'upstream/master' into Pod-Refactor 2016-05-23 14:59:23 -05:00
Fox-McCloud
54b02d7ea0 Simple Animal Loot Refactor 2016-05-20 21:48:29 -04:00
IK3I
7f3af0a1ca Adds pod lock busters
The CE and the Armory now have specialized drills for stubborn pod
flying criminals.

Also fixes a few bugs and oversights
2016-05-17 01:37:21 -05:00
IK3I
b169615080 Final changes of the refactor
A couple bug fixes might be needed, but it /should/ be ready for live.
2016-05-14 19:50:07 -05:00
IK3I
f63328262f Completes Stage One of Occupant Refactor
Occupants are now members of a list with a maximum size and a special
associative tag for pilots. Gating the verbs and testing is still
needed.
2016-05-08 04:24:48 -05:00
Fox-McCloud
8ff32f4566 fixes 2016-04-18 22:53:31 -04:00
Fox-McCloud
5145825470 Part 4 2016-04-17 22:48:05 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07: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
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
Fox McCloud
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1
-tg- disease1
2016-03-30 21:29:58 -04:00
Tigercat2000
ec3502af38 Fix the last of fox's noted bugs, runtime prevention 2016-03-30 18:12:03 -07:00
TheDZD
cc6e89ace8 Merge pull request #4030 from Fox-McCloud/advanced-camera-port
Ports Advanced Cameras
2016-03-30 18:48:16 -04:00
ProperPants
7e67a2bf34 Fixed some spacing. 2016-03-29 20:06:50 -04:00
Fox-McCloud
6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -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
Fox McCloud
5fdf9fb30d Merge pull request #3930 from tigercat2000/ASSAULTPODS
Assault Pods & Fixes
2016-03-20 21:18:44 -04:00
Fox McCloud
8696d7992b Merge pull request #3925 from Tastyfish/chatroom
Adds PDA chatroom app
2016-03-19 22:19:06 -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
Tastyfish
7c3667ecb8 Adds PDA chatroom 2016-03-18 16:45:12 -04:00
Tigercat2000
bc78146178 Port -tg-station cameranets
This should make it much easier to port abductors, if we ever want to do
that.

Changes:
  - Fixed a bug where the AI could not delete photos it takes.
  - Ported -tg- cameranets. This means that all of our camera based systems are more or less up to date with -tg-; 510 features are missing.
  - An AI with the 'camera lights' mode on will now, instead of the button toggling the closest camera's light, toggle camera lights on/off as the AI moves.
  - It now takes a minimum of 30 deciseconds between attempting to track someone, and locking on. This number is increased by their distance away from the AI eye.
  - The camera activate/deactivate proc is now called 'toggle_cam'.
  - The 'trackable' proc has been replaced by a more object-oriented 'mob.can_track()' proc.
  - The 'networks' section of the security camera console is now above the camera list.

In laymans terms: This refactors how security cameras calculate what
viewers can see, and adds a few neat features on top.
2016-03-13 15:06:24 -07:00
Fox-McCloud
bc639a357c more sounds 2016-03-08 22:35:31 -05:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Tastyfish
ff06ea50a6 Fixed in-chat pda message reply link 2016-02-25 07:36:36 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Tastyfish
492ed2f16e Corrects CentComm spelling 2016-02-22 04:39:10 -05:00
VampyrBytes
c403828ce8 Genetics disk fix pt 2
Applies the same fix as #3665 for loading from a disk and creating an
injector

Thanks @Crazylemon64
2016-02-22 06:28:23 +00:00
Fox McCloud
32779c49f4 Merge pull request #3665 from VampyrBytes/GeneticsDisks
Fixes genetics disks (#3657)
2016-02-21 16:53:19 -05:00
VampyrBytes
5a0d30c548 Fixes genetics disks (#3657)
The dna/record on the disk was a reference to the one in the buffer, not
a copy, so if you changed the one in the buffer, the one on the dick
changed.
Fixed it for cloning too

BTW, yes, I know I left in an implied src in one of the lines I changed.
This is because whoever created that file is obsessed with src, and
unless I fancied going through the file and stripping out hundreds of
them, taking out a few would actually detract from the readability of
the code
2016-02-21 17:47:45 +00:00
Tastyfish
85cfccf2d9 Refactors renaming so it works consistently 2016-02-19 21:03:33 -05:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Fox McCloud
fe78b45b41 Merge pull request #3578 from Tastyfish/pda-apps
Complete refactor & partial redesign of the PDA
2016-02-18 13:39:37 -05:00
FalseIncarnate
f44602ab79 Src, Spans, and Chainsaws
Cleans up some src and src.loc in the toys, arcade, and prize counter
files

Replaces some text macros with proper spans

Removes the attack proc from the toy chainsaw, preventing them from
making sounds on hit.
- Still makes the revving sound when you wield them
2016-02-15 02:32:29 -05:00
FalseIncarnate
0015eac2c8 Arcade Prize Counter 2016-02-14 01:58:36 -05:00
Tastyfish
19108df390 Some tweaks to bot and power apps 2016-02-12 20:19:45 -05:00
Tastyfish
a8f9ea2086 pda refactor 2016-02-12 03:24:21 -05:00
FalseIncarnate
954d0dadfa Prize Counter WIP commit 2016-02-12 00:32:21 -05:00
Aurorablade
b42d865c83 almost ready for review 2016-02-11 23:21:13 -05:00
Aurorablade
0f77eb068f Conflicts 2016-02-11 17:57:37 -05:00
Fox McCloud
d1049ad383 Merge pull request #3423 from Crazylemon64/cloning_brain_scan
Adds a brain scan mode to the cloning system
2016-02-03 22:23:10 -05:00
Crazylemon64
1c1bd52c54 Makes brain scan a selected mode rather than a button, for working nice with autoprocess 2016-02-03 10:06:41 -08:00
Aurorablade
6001f3d80c ayyy merge conflicts fix 2016-02-02 20:46:38 -05:00