cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-17 17:16:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,240 Commits 17 Branches 2 Tags
f883e06c2ea881dfd3d7e02d0e86ec3bdaa4fa00
Commit Graph
11309 Commits
Author SHA1 Message Date
TheDZD 8ad5e18757 Merge pull request #4112 from Fox-McCloud/xenobio-overhaul 
Xenobio Refactor/Changes
 2016-04-07 17:54:33 -04:00
Fox-McCloud bea90a5cd1 monkey recycler QoL 2016-04-07 09:29:54 -04:00
Tastyfish 85a58e59a6 Fixes to_chat script fuckery 2016-04-06 20:41:45 -04:00
Fox-McCloud 3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -04:00
Tigercat2000 797740da7d Fix all of the merge conflicts and lacking to_chats with 4041 2016-04-05 21:16:52 -07: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
Tigercat2000 bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07:00
FalseIncarnate 40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -04:00
Tigercat2000 c72cc9606e Merge remote-tracking branch 'upstream/master' into to_chat 
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
 2016-04-05 15:54:48 -07:00
TheDZD e5bc348342 Merge pull request #4096 from Fox-McCloud/tape 
Adds Tape to ArtVend
 2016-04-05 18:34:40 -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 59c0d41695 Merge pull request #4097 from Tastyfish/botsgoddamn 
Tweaks/fixes some bot radio/language stuff, lazarus capsules
 2016-04-05 17:53:00 -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
Fox-McCloud b7afdec18c defines 2016-04-04 17:01:03 -04:00
TheDZD 3bcbccdad6 Merge pull request #4082 from Fox-McCloud/weak-eyes 
Fixes Weakeyes
 2016-04-04 15:12:05 -04:00
Fox McCloud 71c30b879d Merge pull request #4083 from Aurorablade/MeteorOps2 
MeteorOps Tweaks
 2016-04-04 07:14:09 -04:00
Tastyfish 16c8e24f04 Tweaks/fixes some bot radio/language stuff, lazarus capsules 2016-04-04 02:02:19 -04:00
Fox-McCloud da4e7478f0 Adds Tape to ArtVend 2016-04-04 01:03:42 -04:00
Fox-McCloud 3bd37ec757 Simple Animal Spawn Refactor 2016-04-04 00:30:10 -04:00
Fox McCloud 9e74cbcc1b Merge pull request #4090 from Tastyfish/bots23 
Fixes mulebots killing passenger, bot tweaks
 2016-04-03 17:48:39 -04:00
Tastyfish b2d9c2e6a9 Fixes mulebots killing passenger, bot tweaks 2016-04-03 15:39:54 -04:00
Aurorablade eb4ddb247d MeteorOps Tweaks 2016-04-03 01:54:51 -04:00
Fox-McCloud b3b0abd95b Fixes Weakeyes 2016-04-03 01:19:49 -04:00
Tigercat2000 1d7ca47bf5 and line notes 2 2016-04-02 20:30:41 -07: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
Fox McCloud 817b7928eb Merge pull request #4058 from FalseIncarnate/reagents 
Reagent Container Tweaks
 2016-04-02 04:12:23 -04:00
Fox McCloud 13200e7c62 Merge pull request #4049 from Aurorablade/FethasStaph 
Fethas Carnival of Horrors:Fethas Please Stop
 2016-04-01 20:43:06 -04:00
Tigercat2000 d1ae725fa2 fix tile_bound 2016-04-01 16:36:39 -07:00
Tigercat2000 7a41efd1da Last staging fixes 2016-04-01 16:09:43 -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
FalseIncarnate 777f8cbfb6 Beaker and Pill Bottle Labeling 
Can now label Pill Bottles with pens, just like Beakers

Beakers (and pill bottles) can now accept 26 character labels from pens.
 2016-04-01 15:17:47 -04:00
Aurorablade 1db93aae1f Iseeytou 2016-03-31 22:33:29 -04:00
Fox McCloud 80ae4bff80 Merge pull request #4045 from ProperPants/Cyborg_Stacks 
Cleaning and Definition of Cyborg Stacks
 2016-03-31 22:24:19 -04:00
Fox McCloud bca1fd7005 Merge pull request #4044 from Tastyfish/orange-hampsters 
Adds power-generating treadmills to brig cells
 2016-03-31 20:27:43 -04:00
Fox McCloud 8f6d358ea1 Merge pull request #4018 from Tastyfish/buttbots 
Captain Beepsky and His Merry Medibots
 2016-03-31 20:07:43 -04:00
Aurorablade a278328312 reworked the event 2016-03-31 14:03:05 -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 2fe3b35982 Shadowling Fix 2016-03-31 08:45:31 -04:00
ProperPants 0f9797a7c2 Cyborg wood is gone. I don't know why it was there in the first place. 2016-03-31 08:18:39 -04:00
Fox McCloud 68dd38c10d Merge pull request #4040 from Tastyfish/paichat 
Adds chatroom to PAIs
 2016-03-31 04:15:58 -04:00
ProperPants b764f18840 I forgot to change the cyborg modules back to normal for the tiles. 2016-03-30 22:16:09 -04:00
ProperPants 2b4456c12f Cleaned up some cyborg stacks to take almost everything from the parent. 2016-03-30 22:13:28 -04:00
ProperPants 065f3c8a9d Removed the tiles because apparently they're pointless. 2016-03-30 21:32:41 -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