cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,240 Commits 26 Branches 2 Tags
f883e06c2ea881dfd3d7e02d0e86ec3bdaa4fa00
Commit Graph

6335 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
TheDZD
be9087cca9 Merge pull request #4113 from Fox-McCloud/statues-fixing 
TG Statue Fixes/Refactor
 2016-04-07 17:54:17 -04:00
Tastyfish
29f9507052 Fixes pulling blood 2016-04-07 16:35:53 -04:00
Fox-McCloud
64cd6a0cdc TG Statue Fixes/Refactor 2016-04-06 02:20:24 -04:00
Fox-McCloud
3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -04:00
Fox McCloud
a669d0fac4 Merge pull request #4107 from tigercat2000/to_chat 
Replace most (if not all) output << operators with to_chat(user, message)
 2016-04-06 00:39:02 -04:00
Fox McCloud
337ddd1896 Merge pull request #4111 from Tastyfish/straightjackets-derp 
[s]Fixes restrained issue with slot clicking thing
 2016-04-06 00:30:26 -04:00
Tastyfish
f86cb2b049 Fixes straightjacket issue with slot clicking thing 2016-04-05 23:24:24 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07: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
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
a361364a94 Merge pull request #4088 from tigercat2000/offhands 
Add inactive hand to carbon get_access
 2016-04-04 17:19:09 -04: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
Tastyfish
16c8e24f04 Tweaks/fixes some bot radio/language stuff, lazarus capsules 2016-04-04 02:02:19 -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
Tigercat2000
e2442e7fc9 Add inactive hand to carbon get_access 2016-04-03 12:33:52 -07:00
Fox-McCloud
b3b0abd95b Fixes Weakeyes 2016-04-03 01:19:49 -04:00
Tigercat2000
94ff8fc4ef whoops forgot to remove this 2016-04-02 21:32:11 -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
Tigercat2000
7a41efd1da Last staging fixes 2016-04-01 16:09:43 -07:00
Tigercat2000
a36ec06fc2 First 510 merge fixes 2016-04-01 14:20:17 -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
TheDZD
54ed72ffd4 Merge pull request #4052 from Fox-McCloud/simple-animal-eating 
Refactor of Simple Animal Eating
 2016-04-01 15:43:16 -04:00
Fox-McCloud
e277cf292b Headcrab Fix 2016-04-01 01:11:11 -04:00
Fox-McCloud
5d8b02b37a cleanup 2016-04-01 00:39:48 -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
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
ProperPants
f91b5ee332 Never make commits literally five minutes after waking up. 2016-03-31 08:31:35 -04:00
ProperPants
bd4230f469 Cyborg wood was being used by drones. No longer. 2016-03-31 08:25:03 -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
24139b8a84 Refactor of Simple Animal Eating 2016-03-31 07:15:46 -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
Fox McCloud
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1 
-tg- disease1
 2016-03-30 21:29:58 -04:00
ProperPants
bca3c683e2 Cyborg versions of stacks that didn't already have them. Increased cyborg starting rods to one full stack (60 rods). 2016-03-30 20:55:57 -04:00
TheDZD
cc6e89ace8 Merge pull request #4030 from Fox-McCloud/advanced-camera-port 
Ports Advanced Cameras
 2016-03-30 18:48:16 -04:00
Tastyfish
fb9c883b90 Makes medibots ignore IPC's 2016-03-30 17:55:31 -04:00
Fox McCloud
0f8085e1d8 Merge pull request #3980 from Aurorablade/ArtsAndCrafts 
Fethas Carnival of Horrors:Rusty Iron Chef
 2016-03-30 16:25:27 -04:00
Tastyfish
80c0f0ee1f Make pai chatroom cost 5 2016-03-30 11:43:23 -04:00
Tastyfish
653e6738b8 Removes pAI insertion from named secbots 2016-03-29 21:53:56 -04:00