cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-02-08 15:48:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,999 Commits 31 Branches 2 Tags
78d3b321f60bb5d658ffdee4717483e6643671ea
Commit Graph

22322 Commits

Author SHA1 Message Date
Kyep
78d3b321f6 Spacing 2016-07-14 21:25:38 -07:00
Kyep
e22d4abb0c Changes 'Strip before dressing' prompt 2016-07-14 03:21:47 -07:00
Kyep
47a06a739a Improves the admin 'select equipment' verb 
The "select equipment" verb is a button used by admins to dress up
characters for events.
This PR tweaks it to fix some issues and add a few new options.

Major changes:
- All costumes now include ID cards. Including "as job..." options.
- ERT options now actually work. You can outfit a character as any kind
of ert (amber/red/gamma) and any role in that ERT
(sec/medical/eng/commander).
- "Spy", "NT VIP Guest", and "survivor" have been added to the list of
choices. Spy is a cheap traitor with a silenced gun and emag. NT VIP
Guest is a centcom guest with no gear. Survivor is a civilian who
survived some terrible event.

Other Changes:
- reaper: starts out dust implanted
- nanotrasen officer: renamed to nt navy officer
- nanotrasen captain: renamed to nt navy captain
- special ops officer: renamed to nt special ops officer, with different
(more combat-oriented) loadout than joining as this job from the job
screen
- all NT CC outfits: changed headset to centcom, added dust/death
implanters to backpacks
- Tunnel Clown: added full toolbelt
 2016-07-14 01:27:07 -07:00
Fox McCloud
22484a4073 Merge pull request #5012 from Kyep/vampfix 
Makes Vampire preference appear on Traitor panel
 2016-07-13 03:02:11 -04:00
Kyep
17630cef32 Makes Vampire preference appear on Traitor panel 2016-07-12 23:48:41 -07:00
TheDZD
8878cc9b15 Merge pull request #4980 from Fox-McCloud/arse-nath 
Adds in Rathen's Secret
 2016-07-12 21:26:02 -04:00
TheDZD
dd2390d9bb Merge pull request #4987 from Fox-McCloud/cyborg-tweaks 
Cyborg Upgrade Additions and Refactor
 2016-07-12 21:22:57 -04:00
Fox McCloud
5dc65d9137 Merge pull request #4984 from Kyep/evilfax_cluwne 
Adds Cluwne EvilFax
 2016-07-12 17:14:50 -04:00
Fox McCloud
a6323e0bde Merge pull request #5003 from Tastyfish/pipecheck 
Fixes Check Piping verb
 2016-07-12 17:13:15 -04:00
Tastyfish
463fce5453 Fixes Check Piping verb 2016-07-12 00:10:31 -04:00
Fox McCloud
3934b9f841 Merge pull request #4841 from DaveTheHeadcrab/grey_speech_fix 
Grey Update
 2016-07-11 23:13:38 -04:00
Fox-McCloud
a78c6cbf5d changes 2016-07-11 22:45:44 -04:00
SamCroswell
46954091e6 Minor Tweaks 2016-07-11 22:28:35 -04:00
Fox McCloud
b787af15f8 Merge pull request #4934 from Chakirski/BACON! 
Adds AUTHENTIC, JUICY, AMAZING BACON!
 2016-07-11 21:23:41 -04:00
Fox McCloud
c803c4f752 Merge pull request #4911 from Kyep/exile_option 
Makes Exile & Lethal Injection Viable
 2016-07-11 21:21:16 -04:00
TheDZD
5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate 
Bureaucracy Update
 2016-07-11 21:20:06 -04:00
Chakirski
a031ebe889 Update snacks.dm 2016-07-11 20:17:30 -05:00
TheDZD
2b5e36b296 Merge pull request #4935 from Twinmold93/martialartsvampire 
The Sleeping Carp Vampires
 2016-07-11 21:10:57 -04:00
Fox McCloud
829bbdcba9 Merge pull request #4951 from Kyep/ert_improvements 
Improves ERTs
 2016-07-11 21:08:34 -04:00
Fox McCloud
665fb967b2 Merge pull request #4961 from monster860/chemmaster-nanoui 
The Long-Requested Nano-UI-ification of the ChemMaster
 2016-07-11 21:02:25 -04:00
TheDZD
813f6f3778 Merge pull request #4962 from Fox-McCloud/ipc-change 
Removes IPC Firesuit Cheese
 2016-07-11 21:01:31 -04:00
TheDZD
960676d53b Merge pull request #4964 from Kyep/cryo_ghost 
Improves Cryoing
 2016-07-11 21:01:04 -04:00
TheDZD
66c8eb899e Merge pull request #4966 from Fox-McCloud/ntrep-cane 
Nanotrasen Rep Cane Tweak
 2016-07-11 20:59:34 -04:00
TheDZD
ca7530f58d Merge pull request #4968 from Fox-McCloud/blood-refactor 
Blood Refactor+Fixes
 2016-07-11 20:57:25 -04:00
TheDZD
6b047f1ac1 Merge pull request #4975 from Fox-McCloud/cinematic-fix 
Cinematic Fix and Relative Pathing
 2016-07-11 20:53:59 -04:00
TheDZD
2f9dab5f1e Merge pull request #4978 from Krausus/UhOhImSlowingDownAlternateAppearanceCodeAgain 
Actually Fixes Those Stupid Plants (By Fixing Alternate Appearances)
 2016-07-11 20:52:40 -04:00
TheDZD
1184daba8d Merge pull request #4979 from Fox-McCloud/pai-turrets 
pAIs No Longer valid Gun Turret Targets
 2016-07-11 20:48:19 -04:00
Fox McCloud
374b682bf7 Merge pull request #4990 from FlattestGuitar/pulse-stuf 
Fixes pulse shot cost.
 2016-07-11 20:46:22 -04:00
Fox McCloud
595297fb6e Merge pull request #4991 from Krausus/ThereCanOnlyBeOneHookSystem 
Fixes Morgue Updating and Eliminates VG-style Hooks
 2016-07-11 20:41:32 -04:00
TheDZD
48ef42e6cc Merge pull request #5001 from LittleBigKid2000/master 
Fixes the brownstar reagent's description
 2016-07-11 20:08:02 -04:00
Isaac Erwin
2509969a65 Fixes the brownstar reagent's description 2016-07-11 19:48:16 -04:00
TheDZD
b0dcb4ef25 Merge pull request #4989 from Fox-McCloud/borg-attack-fix 
Fixes Borg Stun Arm Bypassing Shields
 2016-07-11 19:01:12 -04:00
Tigercat2000
863595a512 krausy wai 2016-07-11 15:50:15 -07:00
Tigercat2000
15de192719 Metastation Fixes v5555555 
- Fixes a few missing pipes
 - Fixes the grav gen being horrifyingly mangled
 - Fixes runtimes on start because of decorative shuttle consoles
 2016-07-11 15:41:33 -07:00
Krausus
355fb3c080 Fixes morgue updating and removes VGhooks 2016-07-11 17:39:21 -04:00
Fox McCloud
66b35d649d Merge pull request #4983 from DaveTheHeadcrab/wingler_fluff 
Jay Wingler Fluff Item
 2016-07-11 17:34:54 -04:00
Mieszko Jędrzejczak
4751e0988c Fixes pulse shot cost. 2016-07-11 19:52:24 +02:00
SamCroswell
963ca2ca79 ACTUALLY Resolves The Merge Conflicts (Remember To Save, Kids) 2016-07-11 13:06:40 -04:00
SamCroswell
d79302ede6 Merge Conflict Resolution 2016-07-11 13:04:30 -04:00
Fox-McCloud
88468d2698 Fixes Borg Stun Arm Bypassing Shields 2016-07-11 10:45:50 -04:00
Fox-McCloud
b7c71c7c76 differences 2016-07-11 09:23:43 -04:00
Fox-McCloud
f0f229dc8b tweak 2016-07-11 07:07:31 -04:00
Fox-McCloud
2a3ccf3729 Cyborg Upgrade Additions and Refactor 2016-07-11 06:16:44 -04:00
Kyep
e14f1b7529 Adds Cluwne EVILFAX 
Fox Changes

Fox Spacing
 2016-07-11 00:39:11 -07:00
SamCroswell
f5f6817a44 Inane Optimizations And General Pedantry 2016-07-11 02:42:28 -04:00
Fox McCloud
c75de17aef Merge pull request #4916 from Ar3nn/newscasterfuckoff 
Adds silence button to newscasters
 2016-07-11 02:38:24 -04:00
Fox-McCloud
943eb9b6dc grammar 2016-07-11 02:19:24 -04:00
SamCroswell
e84ebcbca7 Jay Wingler Fluff Item 2016-07-11 01:53:52 -04:00
Ar3nn
45d15dd360 !silence! 2016-07-10 20:55:35 -04:00
Fox-McCloud
762ed61881 Adds in Rathen's Secret 2016-07-10 20:04:17 -04:00