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

21624 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
dfa9b73dbb picky nits 2016-05-21 15:39:38 -07: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
Fox McCloud
053f4e3197 Merge pull request #4475 from Tastyfish/buttfax 
Makes photocopied butts use OOP
 2016-05-20 17:04:07 -04:00
Fox McCloud
db4ae11b7f Merge pull request #4469 from QuinnAggeler/swarmer-fix1 
Stops swarmers from eating the PA or releasing the engine
 2016-05-20 16:55:02 -04:00
HugoLuman
50a114116b Removes unneeded else 2016-05-20 13:17:05 -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
HugoLuman
fff7181da8 Reinforces the PA protection 
Adds back in protection for obj/machinery/particle_accelerator and its children, since the PA console is still parented to it.
 2016-05-19 17:37:14 -07:00
HugoLuman
e02222f11f Check actually works now 
Tested it. Hopefully that's the last commit needed.
 2016-05-19 17:31:35 -07:00
Fox McCloud
3b30dae4a0 Merge pull request #4455 from razekpraxis/Paradise_LockClick 
Adds a click sound when you lock a locker
 2016-05-19 19:15:27 -04:00
HugoLuman
ee438cca12 Update swarmer.dm 2016-05-19 16:09:38 -07:00
HugoLuman
0e424a0efd Finishes that check with a return at the end 2016-05-19 16:06: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
HugoLuman
3c66a76e0a Adds a (!powered) check to field generators 
Now they can eat the ones in storage but not the ones holding in the engine
 2016-05-19 16:02:43 -07:00
HugoLuman
80cfaf0793 Fixes typepath of PA parent object 
Corrects /obj/machinery/particle_accelerator/swarmer_act(
to /obj/structure/particle_accelerator/swarmer_act(
I'm guessing that whoever originally coded that missed the typepath and then added all the procs for the child objects because swarmers were still able to eat the PA
Now that it's fixed, the child checks should be unnecessary
 2016-05-19 15:41:11 -07:00
HugoLuman
42305e9dee Adds missing ) 2016-05-19 14:16:11 -07:00
HugoLuman
44c4c23337 Stops swarmers from eating the PA or releasing the engine 
Fixes the erroneous typepaths that protected two unused machinery objects instead of two actual parts of the PA
Stops swarmers from eating field generators. While it may have been intentional for them to eat the ones in secure storage, they could also eat the ones holding in the engine
Attempts to stop swarmers from accessing the engine (and depressurizing adjacent areas) in the first place. I believe the "no breach" only checking for space turfs (rather than airless plating) was an oversight, as it would allow them to causes breaches in other areas as well
 2016-05-19 14:01:24 -07:00
TheDZD
b4ea955d54 Merge pull request #4454 from CrAzYPiLoT-SS13/varioushit 
Recommended version update
 2016-05-19 16:39:23 -04:00
TheDZD
ba62bc7539 Merge pull request #4465 from Fox-McCloud/cryo-fix 
Fixes Cryopod Names
 2016-05-19 16:39:09 -04:00
TheDZD
8956e0a8b2 Merge pull request #4464 from Fox-McCloud/tatorvamp-fix 
Fixes TraitorVamp Chaplains
 2016-05-19 16:38:56 -04:00
Fox-McCloud
ce47fed2d4 Fixes Cryopod Names 2016-05-19 09:46:08 -04:00
Fox-McCloud
986b65fcfa Fixes TraitorVamp Chaplains 2016-05-19 02:34:38 -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
Matt
eb874f5b04 Alrightie 2016-05-18 10:51:17 +02:00
Razek
8efc712b71 fixed 2016-05-18 09:07:59 +01:00
Fox McCloud
bcbeb3024d Merge pull request #4433 from monster860/permatele 
Adds permanent teleporter
 2016-05-17 22:26:18 -04:00
Fox McCloud
2174b5023e Merge pull request #4452 from Tastyfish/tables 
Fixes table stacking, refactors table parts
 2016-05-17 22:02:13 -04:00
Fox McCloud
22ac2314e1 Merge pull request #4438 from QuinnAggeler/carp-fix 
Addresses #4434
 2016-05-17 21:50:30 -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
Tastyfish
0a8cbadfd6 colonoscopy 2016-05-17 20:19:04 -04:00
Fox McCloud
923675e877 Merge pull request #4445 from Vivalas/patch-1 
Fixes #3993
 2016-05-17 16:20:35 -04:00
Fox McCloud
fb16a64c9c Merge pull request #4440 from tigercat2000/abductor_nanaggins 
Abductor probing console human icon
 2016-05-17 16:18:07 -04:00
Razek
9144289780 Adds a click sound when you lock a locker. (I was so bored.) 
Signed-off-by: Razek <megamattman2234@hotmail.co.uk>
 2016-05-17 18:02:39 +01:00
Matt
126c5d679d Welp 2016-05-17 17:51:30 +02:00
Tastyfish
eb273cf76e Makes pAI's die in a consistent way 2016-05-17 09:25:30 -04:00