cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 12:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,120 Commits 26 Branches 2 Tags
54ed72ffd4ae84df9efb5d63a8ea1697017c18c4
Commit Graph

12761 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
TheDZD
4e5dca681b Merge pull request #4024 from Tastyfish/clickyclick 
Makes clicking a filled inventory slot's square be treated like clicking the item
 2016-03-29 17:14:39 -04:00
TheDZD
feec3ea1d8 Merge pull request #4025 from tigercat2000/20slots 
Change max character slots to 20
 2016-03-29 17:14:20 -04:00
TheDZD
efab653008 Merge pull request #4021 from Fox-McCloud/toy-tyrant 
Ends Science's Toy Tyranny
 2016-03-29 17:13:57 -04:00
Fox-McCloud
6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
Crazylemon64
d113fc63e9 Removes dumbness 2016-03-28 23:47:50 -07:00
Crazylemon64
7aa519723b Merge branch 'master' of https://github.com/Crazylemon64/Paradise into metal_foam_space_flooring 2016-03-28 23:13:43 -07:00
Crazylemon64
00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Tigercat2000
61134f9ba4 Replace Synaptizine with Diphenhydramine, mineral for viro 2016-03-28 21:31:01 -07:00
Fox McCloud
65eab3d8c8 Merge pull request #4017 from ProperPants/WorkingBranch 
Additions to Engineering Cyborg and Maintenance Drones
 2016-03-29 00:17:23 -04:00
ProperPants
c1affcd02b Cyborg versions of some stuff. 
Added a line in some commentary that should have been there, but wasn't.
 2016-03-28 23:36:03 -04:00
TheDZD
e827881c01 Merge pull request #4029 from Fox-McCloud/puke-fix 
Puke Fix
 2016-03-28 22:46:18 -04:00
TheDZD
5c800cec04 Merge pull request #4010 from Fox-McCloud/lusty-xeno-maid 
Ports Lusty Xenomorph Maid
 2016-03-28 22:45:41 -04:00