cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-18 03:43:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,512 Commits 15 Branches 2 Tags
732c3b4ae5fa94de9a3cd900fed520a73d1273d2
Commit Graph

13438 Commits

Author SHA1 Message Date
Fox McCloud fe78b45b41 Merge pull request #3578 from Tastyfish/pda-apps 
Complete refactor & partial redesign of the PDA
 2016-02-18 13:39:37 -05:00
Fox McCloud dae905d110 Merge pull request #3614 from Crazylemon64/borer_death_fix 
Borer enhancements
 2016-02-18 13:39:14 -05:00
Fox McCloud a290fd7df7 Merge pull request #3612 from Crazylemon64/accessory_attach 
Lets you put accessories on other people by attacking them with it
 2016-02-18 13:38:40 -05:00
Fox McCloud 0d19e0e8d5 Merge pull request #3622 from Tastyfish/engivend 
EngiVend has camera assemblies & be used by borgs
 2016-02-18 13:38:13 -05:00
Fox McCloud 5f0736e2ed Merge pull request #3624 from Tastyfish/i-have-no-mouth-and-i-must-fork 
Stops utensils from working on mouthless humanoids.
 2016-02-18 13:36:55 -05:00
VampyrBytes e25d9320bd admin_only not adminOnly 2016-02-18 07:53:38 +00:00
Aurorablade 29293dde10 look ma no brain 2016-02-17 22:03:02 -05:00
Tastyfish 50d0d0c5e0 Paid vending machines usable by borgs too 2016-02-17 18:07:23 -05:00
TheDZD cbafa08ba0 Merge pull request #3601 from FalseIncarnate/arcade 
Arcade Prize Counter
 2016-02-17 16:57:49 -05:00
VampyrBytes bcfb77359f reagent not regent 2016-02-17 19:07:56 +00:00
VampyrBytes adf52304ee fixes #3615 
Reagents now have an admin only marker.
adminReagentCheck takes a list of paths and removes anything containing
admin only reagents
removed possibility of random drinks containing adminordrazine
 2016-02-17 12:30:07 +00:00
Tastyfish e27fb5d27f Stops utensils from working on mouthless humanoids 2016-02-16 22:52:56 -05:00
KasparoVy b42e4d7da9 Mask Adjustment Bugfixes 2016-02-16 22:47:19 -05:00
FalseIncarnate 951fb00626 unEquip, typeless list, and upgraded subtype 2016-02-16 22:43:45 -05:00
TheDZD 26f80c2cd3 Merge pull request #3610 from Spacemanspark/more-robot-emotes-because-why-not 
Adds *yes and *no emotes to IPCs and other synthetics.
 2016-02-16 17:28:16 -05:00
Crazylemon64 6a75ede14d Enhances borers in various ways 
- Adds a silent means of two-way conversation between borers and their
  hosts - the borer must make first contact, to avoid spoiling their
  presence

- Borers will now be unable to talk out loud while inside a host, by default -
  they can toggle this with a verb. Borer speech is unaffected.

- Borers will now properly detach from host control upon the death of the
  host

- Borers will now triple their reagent production while sedated by sugar

- Borers infesting and hiding is now silent
 2016-02-16 01:48:04 -08:00
FalseIncarnate 03ecddfc43 Revert "Temporary Prize Counter mapping" 
This reverts commit 441a7345d6.
 2016-02-16 03:50:42 -05:00
FalseIncarnate 441a7345d6 Temporary Prize Counter mapping 
Temporarily adds a prize counter to the bar on Cyberiad and Fitness Room
(dorms) on Metastation
- The metastation one might stay, but the Cyberiad one will very likely
get moved in the near future.

Adds a fully upgraded prize counter to the ninja's holding pen on
Cyberiad's z2

(map-merged)
 2016-02-16 03:39:55 -05:00
Crazylemon64 0ea630f18a Borers will now properly lose control when their host dies 2016-02-15 22:06:53 -08:00
Crazylemon64 5a105a979b Even even more sanity checks 2016-02-15 19:22:48 -08:00
Crazylemon64 3e41bf62b4 Adds further checks to attaching accessories 2016-02-15 19:22:04 -08:00
Crazylemon64 41fdd62d5c Makes things a tad bit better grammarwise 2016-02-15 19:10:54 -08:00
Crazylemon64 09a5764c3b Lets you put accessories on other people by attacking them with it 2016-02-15 19:01:00 -08:00
Crazylemon64 e725613726 Fixes organ DNA and transfer 2016-02-15 18:18:24 -08:00
Fox McCloud 3a1deec3e6 Merge pull request #3602 from VampyrBytes/BorgDamage 
prevents toxloss and oxyloss for silicons
 2016-02-15 16:32:48 -05:00
Aurorablade d81fbaf49c riohgeroi 2016-02-15 14:40:13 -05:00
Spacemanspark 4452c24999 Adds *yes and *no emotes to IPCs and other synthetics. 
Port of https://github.com/PolarisSS13/Polaris/pull/809
 2016-02-15 12:02:03 -06:00
FalseIncarnate aaeccfdff5 Removes the force from tickets 
Tickets no longer deal damage when used as a weapon or thrown.
 2016-02-15 02:36:18 -05:00
FalseIncarnate f44602ab79 Src, Spans, and Chainsaws 
Cleans up some src and src.loc in the toys, arcade, and prize counter
files

Replaces some text macros with proper spans

Removes the attack proc from the toy chainsaw, preventing them from
making sounds on hit.
- Still makes the revving sound when you wield them
 2016-02-15 02:32:29 -05:00
Aurorablade 08d7976f00 AAHHHHHHHHHHHHHHHHHH 2016-02-14 22:06:50 -05:00
Aurorablade 066fafa675 spawning..no not in that way.. 2016-02-14 06:17:28 -05:00
VampyrBytes f7511ae017 oxyloss change set to only borgs 2016-02-14 10:16:45 +00:00
Fox McCloud 9f17e44466 Merge pull request #3603 from FalseIncarnate/kitchen 
Fixes Plump Helmet Biscuits being uncookable
 2016-02-14 04:09:16 -05:00
FalseIncarnate 5376e73252 Fixes Plump Helmet Biscuits being uncookable 
The recipe for the plump helmet biscuit was mistakenly removed a while
back (#535), this returns the recipe to the code

Oven Recipe: 5u water, 5u flour, 1 plump helmet cap mushroom.

🆑
fix: Fixes accidental removal of plump helmet biscuit recipe.
/🆑
 2016-02-14 02:55:19 -05:00
VampyrBytes 02f3db4183 prevents toxloss and oxyloss for silicons 
fixes #3595
stops adjustToxLoss working on silicons, and only allows adjustOxyLoss
when suiciding

Have checked through, nowhere that shouldn't be is directly setting
toxloss and oxyloss, and the only place that uses the setters to set it
to anything other than 0 (statues) doesn't affect silicon based life, so
this will fix the found bug and any other situations is could happen in
 2016-02-14 07:44:42 +00:00
FalseIncarnate 0015eac2c8 Arcade Prize Counter 2016-02-14 01:58:36 -05:00
Aurorablade d532473e89 gibs rustled, limbs logged 2016-02-14 00:00:38 -05:00
TheDZD af648474cf Merge pull request #3583 from Fox-McCloud/permit-refactor 
Refactors Bot Weapon Identification
 2016-02-13 18:23:12 -05:00
Aurorablade 400ed30455 issue with identity transfer 2016-02-13 15:20:21 -05:00
Fox McCloud 284c4fe9ae Merge pull request #3582 from Crazylemon64/dont_use_this_floor 
Makes it painfully obvious not to use plain old /turf/simulated/floor
 2016-02-13 13:40:30 -05:00
Aurorablade 9a55bb11b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-13 06:37:49 -05:00
Fox McCloud 771babcd0a Merge pull request #3576 from FalseIncarnate/kitchen 
Adds Chimichangas
 2016-02-13 01:15:00 -05:00
Tastyfish 8d51fc8f1e Fixed handcuff hud overlay 2016-02-13 00:39:04 -05:00
Aurorablade 7cb4534227 Dionas have a liver 2016-02-13 00:18:16 -05:00
Tastyfish 75924d00d1 Made signaller radio init reliably for starting player 2016-02-12 23:18:24 -05:00
Crazylemon64 b71905dbb1 Updates the admin's buildmode to use "plasteel" floor 2016-02-12 18:43:57 -08:00
Tastyfish 19108df390 Some tweaks to bot and power apps 2016-02-12 20:19:45 -05:00
Fox McCloud c028b4e8b5 Merge pull request #3547 from KasparoVy/Colouring-Bandanas 
Adds Orange + Purple Bandanas and Bandana Colouring, Taj/Una Bandana Sprite Tweaks + Mask Adjustment Refactor
 2016-02-12 18:34:30 -05:00
Fox McCloud ce47eefcf2 Merge pull request #3545 from VampyrBytes/BreakSlipLock 
walking prevents sliplock
 2016-02-12 18:19:50 -05:00
TheDZD 65a788d51f Merge pull request #3569 from Fox-McCloud/unarmed-golems-martial 
Unarmed Attack+Martial Arts Update+Golem Refactor
 2016-02-12 18:17:32 -05:00