cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 09:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,030 Commits 26 Branches 2 Tags
ec9bc0ac2f29b258ff55115457572ae1f6ce6cf6
Commit Graph

13254 Commits

Author SHA1 Message Date
IK3I
ec9bc0ac2f Merge remote-tracking branch 'upstream/master' into Pod-Refactor 2016-05-23 14:59:23 -05:00
Fox McCloud
6bb93b626a Merge pull request #4489 from Tastyfish/ambul 
Fixed ambulance move runtime
 2016-05-22 20:51:32 -04:00
Tastyfish
422a320aad Fixed ambulance move runtime 2016-05-22 20:45:25 -04:00
Fox McCloud
0d273521ce Merge pull request #4432 from monster860/floorpainter 
Adds the floor painter
 2016-05-22 18:43:15 -04:00
Fox McCloud
b3e07fdbcf Merge pull request #4446 from KasparoVy/fix_rejuv 
Fixes #4435, Refactors Rejuvenation, Fixes Flipping Runtime
 2016-05-22 18:39:38 -04:00
TheDZD
477fe04781 Merge pull request #4447 from QuinnAggeler/disguise 
Examine refactor - Disguises
 2016-05-22 18:34:19 -04:00
TheDZD
6e2b236f81 Merge pull request #4480 from Fox-McCloud/simple-animal-loot-refactor 
Simple Animal Loot Refactor
 2016-05-22 18:31:43 -04:00
Fox-McCloud
386cb1e12d syndicakes 2016-05-22 18:23:20 -04:00
TheDZD
db7ba34b7b Merge pull request #4479 from Fox-McCloud/snack-tweaks 
Snack Tweaks to Donk Pockets
 2016-05-22 18:16:26 -04:00
KasparoVy
ac91d9e37b Fixes Flipping Runtime 2016-05-22 17:00:13 -04:00
KasparoVy
acaa71a651 Clears Hallucinations and Properly Handles the Long-Dead 2016-05-22 16:34:51 -04:00
TheDZD
2e97cb8cd0 Merge pull request #4478 from DaveTheHeadcrab/SyringeIcons 
Updates Syringe Icons
 2016-05-22 16:32:47 -04:00
SamCroswell
1bf59c22ef Bows Down to Overlord DZD 2016-05-22 16:28:23 -04:00
Fox McCloud
17f9b25e30 Merge pull request #4477 from FalseIncarnate/kitchen 
More Fudge Flavors
 2016-05-21 20:38:50 -04:00
Fox McCloud
0f3d69fadc Merge pull request #4474 from Tastyfish/reagent-air 
Standardizes behavior of a few reagents
 2016-05-21 20:37:20 -04:00
Fox McCloud
5b27ce3e2e Merge pull request #4471 from QuinnAggeler/drask-fluff 
MMI Sprite refactor, new MMI sprites for weird brains
 2016-05-21 20:36:43 -04:00
Crazylemon64
b44b40d387 You can now fasten the TEG circulators, to make your own TEG 2016-05-21 14:33:05 -07:00
Fox McCloud
0c85e809be Merge pull request #4472 from Tastyfish/ntai 
Adds NT AI core display
 2016-05-21 12:02:41 -04:00
Tastyfish
487778eb3d Removes air pill thing completely 2016-05-21 11:56:45 -04:00
TheDZD
b000ae963c Merge pull request #4476 from Tastyfish/is_mechanical 
Makes bots also mechanical
 2016-05-21 10:12:49 -04:00
Fox-McCloud
54b02d7ea0 Simple Animal Loot Refactor 2016-05-20 21:48:29 -04:00
Fox-McCloud
f93b696d4d Snack Tweaks to Donk Pockets 2016-05-20 19:35:42 -04:00
HugoLuman
61d36843f7 Refactors MMI.dm to remove type-checks for brain sprites, 
aside from the xeno brain, which does other stuff within its type check.

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-05-20 14:23:55 -07:00
FalseIncarnate
720aba1fa5 More Fudge Flavors 
Adds 4 new fudge flavors!

Peanut Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, and 3 peanuts

Cherry Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, 3 cherries

Cookies 'n' Cream Fudge:
- Made with 5u milk, 5u sugar, 5u cream, 1 chocolate bar, 1 cookie

Turtle Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, 1 peanut, 1 caramel

Also adjusts the standard fudge recipe
- Now 5u milk, 5u sugar, 1 chocolate bar
- Fixes #4457
- REMINDER: These use chocolate bars made via reaction, not the candy
bars you make / buy from machines
 2016-05-20 14:58:29 -04:00
Tastyfish
bfd94be12f Makes bots also mechanical 2016-05-20 06:57:21 -04:00
Tastyfish
a6d762221c Makes photocopied butts use OOP 2016-05-20 05:06:39 -04:00
Tastyfish
afe2aa8e31 Makes gas reagents have standardized behavior, skrell liver behavior generalized 2016-05-20 04:27:59 -04:00
Tastyfish
f7dec6a34d Adds NT AI core display 2016-05-20 00:47:00 -04:00
HugoLuman
c1a333f504 Gives Drask brains their own MMI sprite 
It doesn't make much sense for their brains to look like other brains when put into an MMI.dm

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-05-19 21:35:18 -07:00
Fox McCloud
dd8feb687b Merge pull request #4451 from Tastyfish/is_mech 
Makes is_mechanical() use OOP, removes bizarre chain procs
 2016-05-19 19:06:05 -04:00
KasparoVy
701df43ee0 Doesn't Rejuvenate Limbs or Organs if ones Exist on Mob... 
... with the same limb name (in the case of external organs) or the same slot (in the case of internal organs) to prevent duplication.
 2016-05-18 23:59:12 -04:00
KasparoVy
763db82dca Icon Update Fix 2016-05-18 23:59:11 -04:00
KasparoVy
548a4681f1 Just a bit of housekeeping. 2016-05-18 23:59:09 -04:00
KasparoVy
55bdf7dbe3 Vox now Spawn with Their Stacks Again. 
Since this organ doesn't interfere with Heist objectives, gave it back
to the Vox.

Also adjusts a couple comments.
 2016-05-18 23:59:08 -04:00
KasparoVy
5cdaa4c90a Rejuvenating Organs will now Clear Disfigurement of the Head 2016-05-18 23:59:06 -04:00
KasparoVy
4f05d7b3f5 Rejuvenation Fix/Refactor Pass 1 2016-05-18 23:59:05 -04:00
TheDZD
42bca48c0e Merge pull request #4458 from KasparoVy/diona_fix 
Fixes a Horrible Diona Runtime [Probably Urgent]
 2016-05-18 18:52:01 -04:00
KasparoVy
196a897444 Diona Fix 
Repaths Diona bodyparts to fix a runtime.
 2016-05-18 17:49:47 -04:00
HugoLuman
057d2104e8 Adds checks for disguise being worn 
Now for the disguise string to appear, the item that gives it must be in a worn slot
 2016-05-18 12:40:44 -07:00
Fox McCloud
bcbeb3024d Merge pull request #4433 from monster860/permatele 
Adds permanent teleporter
 2016-05-17 22:26:18 -04:00
Fox McCloud
a1d2261c68 Merge pull request #4453 from Tastyfish/get-good-at-dying 
Makes pAI's die in a consistent way
 2016-05-17 21:47:44 -04:00
Tastyfish
dd4991d268 Makes pAI folding messages not weird, code less shit 2016-05-17 20:26:49 -04:00
Fox McCloud
923675e877 Merge pull request #4445 from Vivalas/patch-1 
Fixes #3993
 2016-05-17 16:20:35 -04:00
Tastyfish
eb273cf76e Makes pAI's die in a consistent way 2016-05-17 09:25:30 -04:00
Tastyfish
ef3859203b Makes is_mechanical() use OOP, removes bizarre is_active() 2016-05-17 07:25:52 -04:00
Fox McCloud
e60ba418d0 Merge pull request #4450 from Tastyfish/fuck 
Makes the galaxy not be on Orion's belt
 2016-05-17 04:20:47 -04:00
IK3I
c7eb997a5a Fixes some items not being craftable 2016-05-17 01:37:21 -05:00
IK3I
7f3af0a1ca Adds pod lock busters 
The CE and the Armory now have specialized drills for stubborn pod
flying criminals.

Also fixes a few bugs and oversights
 2016-05-17 01:37:21 -05:00
Tastyfish
f19a777d7e literally ruined the game 2016-05-17 00:56:32 -04:00
HugoLuman
e4a3f3a4b4 Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into disguise 2016-05-16 19:00:26 -07:00