cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-09-01 00:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
34,813 Commits 14 Branches 2 Tags
97252cd2f8619aeac697152f7fbd6b2ebad38dfe
Commit Graph
26124 Commits
Author SHA1 Message Date
Aurorablade 97252cd2f8 MEdicalgear 2017-07-01 22:55:40 -04:00
tigercat2000andGitHub 96bd0b80e0 Merge pull request #6516 from fludd12/Grey-Rework 
Grey Rework
 2017-06-30 08:29:31 -07:00
fludd12 61ac035415 Fixes the last fixes of the last fixes 
frick why
 2017-06-30 01:00:06 -04:00
fludd12 b33750ece8 Fixes the last fixes 2017-06-29 17:24:57 -04:00
Kluys 04b02435fb Bob ross painting 
While trying to fix my github accidentally closed https://github.com/ParadiseSS13/Paradise/pull/7629 from the shell.

Redid the entire PR.
Changes remained the same
![Image of captains office](https://puu.sh/wuWt0/4ea9796196.png)

🆑 Kluys
Add: Bob ross painting in the captains office called "calming painting".

Also changes around the entertainment monitor and light switch to accomodate.

Fix: Clown painting was named "\improper mech painting"
/ 🆑
 2017-06-29 21:28:04 +02:00
fludd12 933d7e9780 Fixes the last things 2017-06-29 00:45:04 -04:00
tigercat2000andGitHub f910683028 Merge pull request #7663 from Fox-McCloud/limb-aug-open 
Fixes Limb Augmentation Open Wound
 2017-06-28 21:39:50 -07:00
Fox-McCloud 5ae7510038 Fixes Limb Augmentation Open Wound 2017-06-29 00:27:45 -04:00
tigercat2000andGitHub f297ecc757 Merge pull request #7659 from Fox-McCloud/ipc-head-fix 
Fixes IPC Heads
 2017-06-28 20:20:57 -07:00
Fox-McCloud 12ffb7e160 Fixes IPC Heads 2017-06-28 22:35:15 -04:00
Alffd d090d2134a Topic Kick 2017-06-28 20:15:07 -04:00
Fox McCloudandGitHub 9f27dd1068 Merge pull request #7580 from Aurorablade/ITSALIVE 
Re-Open sentience event
 2017-06-28 17:37:59 -04:00
Sam 466f12db20 Fixes sprite & desc issues 2017-06-28 12:27:23 +01:00
Aurorablade 86dd1db600 fine 2017-06-28 00:37:49 -04:00
Fox McCloudandGitHub f972d0a668 Merge pull request #7616 from SamHPurp/coroner-antag-items 
Allows coroner to use Medical antag items & Chef to get antag poison bottles
 2017-06-27 16:35:43 -04:00
tigercat2000andGitHub 2c935a9a31 Merge pull request #6940 from Citinited/pipe-dreams-travis-woo 
Adds the Rapid Pipe Dispenser (RPD)
 2017-06-27 13:32:59 -07:00
Fox McCloudandGitHub 2e25253d0b Merge pull request #7640 from Kyep/gimmick_team 
Adds Jani-ERT, Paranormal ERT, and Gimmick Teams in general
 2017-06-27 16:32:26 -04:00
Fox McCloudandGitHub 738e529208 Merge pull request #7634 from Aurorablade/Victorian 
Phantasmic Dreams Victorian Clothing
 2017-06-27 16:31:23 -04:00
tigercat2000andGitHub 88430f4e3d Merge pull request #7507 from FlattestGuitar/midnight-fluffles-v2 
fluff items for Birdtalon and Ssscratches
 2017-06-27 13:09:37 -07:00
Fox McCloudandGitHub 5aa7306c16 Merge pull request #7614 from SamHPurp/adds-rolling-pins 
Adds rolling pins to the kitchen equipment crate
 2017-06-27 16:00:44 -04:00
Crazy LemonandGitHub 2679b234e6 Merge pull request #7159 from FlattestGuitar/soul-stone-electric-boooogllgsdglgl 
Makes Chaplain soulstones opt-in 👻
 2017-06-27 12:57:12 -07:00
Fox McCloudandGitHub 5a8d939a44 Merge pull request #7256 from tigercat2000/karmatab 
Restores the karma verbs tab
 2017-06-27 15:44:31 -04:00
Fox McCloudandGitHub 6a893c6cd8 Merge pull request #7642 from ProperPants/Plasma-Viro-Suit 
Gave plasmaman virologists a medical plasma suit
 2017-06-27 15:31:21 -04:00
Fox McCloudandGitHub 260385b1f6 Merge pull request #7543 from Kyep/gamma_pod 
Updates Gamma Ship
 2017-06-27 15:28:41 -04:00
tigercat2000andGitHub add07e305c Merge pull request #7595 from Fox-McCloud/augmenting-and-selection 
Adds in Limb Augmentation and Limb Company Selection
 2017-06-27 12:28:16 -07:00
FlattestGuitar bda736fb7c Merge branch 'master' into PAIN 2017-06-27 21:18:17 +02:00
tigercat2000andGitHub fb83d58607 Merge pull request #7436 from Alexshreds/emp 
Radio EMP
 2017-06-27 12:02:03 -07:00
Fox-McCloud f1746e011e fixes 2017-06-27 14:45:25 -04:00
tigercat2000andGitHub 13a862be02 Merge pull request #7556 from SamHPurp/couple-more-random-variants 
Adds random colours on cable cuffs & crayons, and the ability for flashes to start burnt out
 2017-06-27 11:41:27 -07:00
tigercat2000andGitHub e238e5b7bc Merge pull request #7565 from imsxz/removes-singualrity-beacon-from-surplus-crate 
Removes singularity beacon from surplus crate
 2017-06-27 11:37:50 -07:00
Fox McCloudandGitHub 12a1e27f1f Merge pull request #7576 from SamHPurp/adds-door-vore 
Alters the AI's chat message OPEN link
 2017-06-27 14:30:54 -04:00
tigercat2000andGitHub 46dcfe3190 Merge pull request #7619 from SamHPurp/buff-barbers 
QOL improvement for antag barbers
 2017-06-27 11:27:40 -07:00
tigercat2000andGitHub 01826822dc Merge pull request #7622 from SamHPurp/move-water-coolers 
Enables Water Coolers to be movable
 2017-06-27 11:26:26 -07:00
ProperPants 1b49324a1e Gave plasmaman virologists a medical plasma suit 2017-06-26 21:22:59 -04:00
Fox McCloudandGitHub 30c59c3bd2 Merge pull request #7204 from Crazylemon64/tk_refactor 
Tk refactor+Remote tool use
 2017-06-26 16:55:04 -04:00
tigercat2000andGitHub 53691bdd35 Merge pull request #7586 from SamHPurp/Coroners-have-a-stronger-stomach 
Stops Coroners from barfing while doing autopsies...
 2017-06-26 10:28:56 -07:00
tigercat2000andGitHub 1efb389f06 Merge pull request #7639 from Kyep/priority_slots_fix 
Fixes #7630 - job priority outlasting slots being filled
 2017-06-26 10:21:15 -07:00
tigercat2000andGitHub 9561a4a645 Merge pull request #7627 from Kyep/job_priority_v2 
Allows head jobs to be prioritized
 2017-06-26 10:17:09 -07:00
SamandGitHub 880c2d2a17 Fixes formatting issue 2017-06-26 18:15:23 +01:00
tigercat2000andGitHub da6eb3a90e Merge pull request #7631 from Kyep/drone_playtime 
Adds 10h playtime requirement to drones
 2017-06-26 09:57:48 -07:00
Kyep 62bc56a080 Adds jani/paranormal ERT and more 2017-06-26 01:55:15 -07:00
Kyep 2f01965808 Fixes #7630 
🆑 Kyep
fix: Prioritized jobs now lose their priority status once all their
slots are filled. In the event someone with a formerly prioritized job
cryos, the HoP may want to re-prioritize the job.
/ 🆑

Fixes #7630
Prevents prioritized jobs, even after being filled, from being listed in
green on the new_player screen for the rest of the round.
 2017-06-25 18:17:04 -07:00
Kyep 6810e5f57e Fixes #7635 2017-06-25 14:20:32 -07:00
Aurorablade deb6004b94 Dressyisprettyyaya 2017-06-24 23:33:34 -04:00
MarcellusPyeandGitHub 2f2da1e63b Add Vulpkanin emotes to *help 
Because @Allfd forgot to in merge #7110.
 2017-06-25 12:06:25 +12:00
Kyep 410c365e52 Adds 10h playtime requirement to drones 
Drones are essentially mini engineering borgs, with the ability to run
under objects, ventcrawl, ignore the AI and respawn themselves. Given
that we have playtime requirements for borgs, we really should have
playtime requirements for these too.
Also, this change was requested by Neca.

🆑 Kyep
add: Playing as a drone now requires 10h of playtime.
fix: Admin-ghosts can now interact with (ie: activate) the drone fab
without having to spawn in as engineer to do so.
/ 🆑
 2017-06-24 15:40:25 -07:00
Kyep 3487d34b3b Splits blacklist 2017-06-24 01:55:58 -07:00
Citinited d86fc10b3f Removes a random continue 2017-06-24 08:56:29 +01:00
Citinited 8931a06936 Crazylemon changes 2017-06-24 08:08:55 +01:00
SamandGitHub 18709afd73 CMO can demote coroners 
Looks like an issue with conflict resolution in the past that this got missed.
 2017-06-24 07:32:19 +01:00