cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 14:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,134 Commits 26 Branches 2 Tags
a36ec06fc2cb037870ef680fe99eee31fea6efbe
Commit Graph

21001 Commits

Author SHA1 Message Date
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
TheDZD
c659cca883 Merge pull request #4046 from Fox-McCloud/full-add 
Fully Re-Activates Disease1
 2016-04-01 15:42:02 -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
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
0c74d7bc29 nanomachines traitor bottle 2016-03-31 20:38:15 -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
TheDZD
4a3eb6cb07 Merge pull request #4057 from Aurorablade/iconfix 
Fixes bloated human head
 2016-03-31 18:18:35 -04:00
TheDZD
8c5e73129b Merge pull request #4056 from Tastyfish/paper-exploit 
[s]Fixes paper limit exploit
 2016-03-31 17:17:25 -04:00
Aurorablade
b35299079f Fixes bloated human head 2016-03-31 17:01:23 -04:00
Tastyfish
bd76a0b3fb Fixes paper limit bugs 2016-03-31 16:58:27 -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
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
Crazylemon64
221cbc82a9 I tested this, and IPCs should go blind upon losing their head 
I think the cause of this bug was organs not being removed on decap, which
has since been fixed
 2016-03-30 21:16:42 -07:00
Fox-McCloud
d2907e3631 oh hell 2016-03-30 22:52:36 -04:00
Fox-McCloud
560eb17f9d Fully Re-Activates Disease1 2016-03-30 22:31:59 -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
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
Fox-McCloud
9127c357e9 further thingssssssssssssssssssssssss 2016-03-30 18:17:55 -04:00
Tastyfish
fb9c883b90 Makes medibots ignore IPC's 2016-03-30 17:55:31 -04:00
Tastyfish
1fc692ba94 Adds power-generating treadmills to brig cells. 2016-03-30 17:08:04 -04:00
Fox McCloud
d83391fa68 Merge pull request #4005 from FlattestGuitar/alcohol 
Alcohol percentages!
 2016-03-30 16:44:41 -04:00
Fox McCloud
b15b640a24 Merge pull request #4038 from Aurorablade/DemonFixing 
fixes demons
 2016-03-30 16:34:22 -04:00
Fox McCloud
ec9a7a486d Merge pull request #3927 from Crazylemon64/metal_foam_space_flooring 
Metal foam walls will now also produce plating on space tiles
 2016-03-30 16:26:56 -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
Tigercat2000
12efef6029 Add wizarditis as contraband for the MagiVend 2016-03-30 11:02:09 -07:00
Tigercat2000
917dc9ab54 Add PanDEMIC design datum 2016-03-30 10:58:24 -07:00
Tigercat2000
32c3cde6ad Fix advanced disease mixing (stupid fucking reagent code) 2016-03-30 10:55:22 -07:00
Tigercat2000
113c70a11b Fix Monkey-Transform disease 2016-03-30 10:55:17 -07:00
Tastyfish
80c0f0ee1f Make pai chatroom cost 5 2016-03-30 11:43:23 -04:00
Tigercat2000
25fa8ea2c9 viro consoles 2016-03-29 19:15:17 -07:00
Fox McCloud
acd72d796d Merge pull request #4028 from Tastyfish/statusdisplays 
Improves Shuttle ETA status display mode
 2016-03-29 21:55:17 -04:00
Tastyfish
653e6738b8 Removes pAI insertion from named secbots 2016-03-29 21:53:56 -04:00
Tastyfish
9826985f3f Adds chatroom to PAIs 2016-03-29 21:44:29 -04:00
Fox-McCloud
c345b8a761 forcemove 2016-03-29 21:36:58 -04:00
Aurorablade
a34efa3af8 fixes demons 2016-03-29 20:51:16 -04:00
ProperPants
7e67a2bf34 Fixed some spacing. 2016-03-29 20:06:50 -04:00