cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,133 Commits 13 Branches 2 Tags
817b7928ebdce39f7baec50e1ead4edd97076cc1
Commit Graph
27133 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fox McCloud d7363f5ffb Merge pull request #4064 from VampyrBytes/trashNforks 
Fixes forks producing trash/not leaving trash
 2016-04-01 19:53:26 -04:00
ParadiseSS13-Bot 02a21a845c Automatic changelog generation for PR #4052 2016-04-01 15:43:18 -04: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
ParadiseSS13-Bot d47e3387e7 Automatic changelog generation for PR #4046 2016-04-01 15:42:04 -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
ParadiseSS13-Bot d55523d931 Automatic changelog generation for PR #4063 2016-04-01 15:22:42 -04:00
TheDZD 4ddd1f0b60 Merge pull request #4063 from Fox-McCloud/headcrab-fix 
Headcrab Fix
 2016-04-01 15:22:40 -04: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
VampyrBytes 48ba721b91 Fixes forks producing trash/not leaving trash 
Fixes #4059
Forks now don't produce trash when eaten off
Forks now do leave trash when taking the last bit of food from the
original item
 2016-04-01 08:05:57 +01: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
FalseIncarnate 2338cfecfe One more color macro 2016-03-31 21:43:04 -04:00
FalseIncarnate ce18b58e20 Prevents splashing onto closed beakers 
Also removes relative pathing and replaces color macros in
glass_containers.dm
 2016-03-31 21:36:38 -04:00
FalseIncarnate 0d440f088a Notify player when filling full container from sink 2016-03-31 21:12:46 -04:00
Fox-McCloud 0c74d7bc29 nanomachines traitor bottle 2016-03-31 20:38:15 -04:00
ParadiseSS13-Bot c7125a4070 Automatic changelog generation for PR #4044 2016-03-31 20:27:44 -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
ParadiseSS13-Bot 53584b0b20 Automatic changelog generation for PR #4039 2016-03-31 20:27:11 -04:00
Fox McCloud 84801ae98a Merge pull request #4039 from TheDZD/fukken-away-missions 
Removes Easily Abused Away Mission Items/Mobs
 2016-03-31 20:27:09 -04:00
ParadiseSS13-Bot fbad81f257 Automatic changelog generation for PR #4018 2016-03-31 20:07:47 -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
TheDZD 0922427c3a Merge pull request #4054 from Fox-McCloud/shadowling-fix 
Shadowling Fix
 2016-03-31 16:33:59 -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 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
ParadiseSS13-Bot 38692feb95 Automatic changelog generation for PR #4040 2016-03-31 04:16:01 -04:00
Fox McCloud 68dd38c10d Merge pull request #4040 from Tastyfish/paichat 
Adds chatroom to PAIs
 2016-03-31 04:15:58 -04:00
Fox McCloud 742fa3ce72 Merge pull request #4047 from Crazylemon64/no_more_ipc_permablind 
IPCs (and diona) no longer go permablind
 2016-03-31 04:15:39 -04:00
Aurorablade ebea66f7dd heeeeeheeee 2016-03-31 02:12:57 -04:00
Aurorablade 0feac81bba TeeHee 2016-03-31 02:10:27 -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
ParadiseSS13-Bot df30c7430a Automatic changelog generation for PR #4019 2016-03-30 21:30:01 -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