cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,983 Commits 26 Branches 2 Tags
2e97cb8cd044306fff497ea31f8ef07cb76dcc28
Commit Graph

13222 Commits

Author SHA1 Message Date
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
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
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
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
Tastyfish
f19a777d7e literally ruined the game 2016-05-17 00:56:32 -04:00
TheDZD
cb5f572969 Merge pull request #4423 from Fox-McCloud/foam 
Foam Fixes+Changes
 2016-05-16 20:15:39 -04:00
Vivalas
2190c9ed34 Fixes #3993 2016-05-16 14:18:01 -05:00
TheDZD
5351ea58b8 Merge pull request #4436 from monster860/notrust 
Fix shuttle HREF exploit
 2016-05-15 11:31:01 -04:00
monster860
f58887fa1f removes the fun part 2016-05-15 10:30:19 -04:00
monster860
b1bef10909 Fix shuttle HREF exploit 2016-05-15 10:17:26 -04:00
monster860
be6c65efc3 adds it to rnd 2016-05-14 18:10:08 -04:00
TheDZD
d16498d685 Merge pull request #4421 from monster860/camerachunkfix 
Fixes camerachunk problem
 2016-05-14 10:46:10 -04:00
Fox McCloud
3ee2e470a1 Merge pull request #4331 from KasparoVy/voxhair 
Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Fixes/Refactors Morph + Features to Morph and CMA...
 2016-05-13 15:36:34 -04:00
Fox McCloud
9e65cd7564 Merge pull request #4231 from monster860/concurrency 
Telecomms concurrency fix
 2016-05-13 15:34:15 -04:00
TheDZD
8e6c33cf47 Merge pull request #4401 from Fox-McCloud/hidden 
Removes Players Ready From Lobby
 2016-05-13 15:28:57 -04:00
Fox McCloud
825e597510 Merge pull request #4408 from CrAzYPiLoT-SS13/pAIze 
Adds pAIzing
 2016-05-13 15:17:07 -04:00
Fox-McCloud
e22bc8a42b Foam Fixes+Changes 2016-05-12 23:47:30 -04:00
monster860
a5da710c8b Fixes camerachunk 2016-05-12 18:20:49 -04:00
Fox-McCloud
b6edc4a0ac Can Flip Over Someone 2016-05-10 23:46:25 -04:00
TheDZD
06eafc8a25 Merge pull request #4407 from Fox-McCloud/no-guns 
Refactors Species Gun Handling
 2016-05-10 22:46:52 -04:00
KasparoVy
e5fae9c078 Small Fix 
Fixes rare occasions where markings (IPC optics) and head accessories
wouldn't reset if you switched species via C.M.A.
 2016-05-10 02:23:41 -04:00
KasparoVy
1d0965b1f9 Back up to date. 2016-05-10 00:25:42 -04:00
KasparoVy
13003fe351 Merge branch 'temp2' into temp 2016-05-10 00:10:15 -04:00
TheDZD
6560ec9bc6 Merge pull request #4380 from Fox-McCloud/simple-animal-damage 
Simple Animal Damage Fix+Change
 2016-05-09 21:23:50 -04:00
Tastyfish
a421a6dd3a Makes Load Slots dialog come up on top of Character Preferences 2016-05-09 20:34:23 -04:00
TheDZD
b63954fa8d Merge pull request #4387 from tigercat2000/character_menu_redesign 
Preference Screen Overhaul
 2016-05-09 19:18:29 -04:00
TheDZD
be16c5612c Merge pull request #4386 from Fox-McCloud/emote-fixup 
Emotes work when not in lowercase
 2016-05-09 19:13:11 -04:00
TheDZD
596485e304 Merge pull request #4385 from FlattestGuitar/tapegag 
Tape gags for all
 2016-05-09 19:12:53 -04:00