cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 01:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,027 Commits 26 Branches 2 Tags
dc825a7bfa58ee25d81ac0f58f37cd2170be852f
Commit Graph

19712 Commits

Author SHA1 Message Date
variableundefined
dc825a7bfa Merge pull request #11231 from Arkatos1/Tips 
Adds Tip of the round + Show Custom Tip admin verb + Give Random Tip OOC verb
 2019-04-16 19:43:55 +08:00
variableundefined
e8b506be9b Merge pull request #11304 from Markolie/claws 
Remove infinite claw sharpening with whetstones
 2019-04-16 19:42:08 +08:00
Fox McCloud
3ff16da2e2 Merge pull request #11301 from KasparoVy/vox-undergarments 
Adds Striped Normal-height Socks & All the Undergarments for Vox
 2019-04-15 11:44:34 -04:00
Mark van Alphen
a9fa2f32e1 Remove infinite claw sharpening 2019-04-15 00:01:08 +02:00
KasparoVy
923614a475 Codes in the Undergarments, Final Sprite Tweaks & Armalis Fix 
Removes the old Vox undergarments
Adds species_fitting of undergarments (making all the Vox versions usable) to update_icons and character setup preview
Disables undergarments for Armalis
Fixes & adjusts some Vox undergarment sprites based on testing results.
Removes flesh from shredded Vox uniform sprites.
 2019-04-13 22:00:13 -04:00
joep van der velden
36f5c8ea14 let cmd_admin_pm handle the null client 2019-04-13 10:42:08 +02:00
joep van der velden
9598dcac5e fixed PM's 2019-04-13 00:57:59 +02:00
variableundefined
19a26909dc Merge pull request #11279 from Arkatos1/Orbit 
Ghosts now orbit around their followed targets
 2019-04-11 20:41:37 +08:00
Crazy Lemon
6c4eb66da8 Merge pull request #11282 from Fox-McCloud/atmos-defines 
Atmos Define Cleanup + Plasma Tweaks
 2019-04-10 22:18:52 -07:00
Fox McCloud
112129779c Merge pull request #11280 from Ionward/mantles 
Adds suit-slot cosmetic mantles!
 2019-04-11 00:43:29 -04:00
Ionward
54536350c7 adjusted cold protection inheritence stuff 2019-04-10 12:09:08 -07:00
Ionward
0266c2fee2 fixed the display names in the loadout to fit alphabetical order better, and adjusted allowed list spacing 2019-04-09 21:12:25 -07:00
Ionward
4d754dde41 adjusted armor values and added options to the suit loadout menu 2019-04-09 20:49:14 -07:00
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update 
The Nations Update Everyone Deserves!
 2019-04-09 20:47:34 -07:00
variableundefined
c6b8daa9b1 Merge pull request #11227 from Fox-McCloud/sr-update 
Minor Strange Reagent Tweaks
 2019-04-10 10:47:40 +08:00
variableundefined
1a5b5dabe4 Merge pull request #11230 from Fox-McCloud/tweaks-crit 
Newcrit Death Tweak
 2019-04-10 10:47:02 +08:00
variableundefined
aee2f6772e Merge pull request #11217 from Fox-McCloud/reagent-bodytemp 
Tweaks Reagent Bodytemp Interaction
 2019-04-10 10:42:31 +08:00
variableundefined
9ae231ee99 Merge pull request #10327 from Fox-McCloud/fix-cqc 
Fixes and Updates CQC
 2019-04-10 10:36:44 +08:00
variableundefined
17030d02fe Merge pull request #11214 from Arkatos1/Sling_Chat 
Shadowlings now have a slightly bigger colored text when speaking in the Shadowling Hivemind
 2019-04-10 10:13:16 +08:00
Fox McCloud
1ad27bc030 more hit type verbs 2019-04-09 21:57:47 -04:00
Fox McCloud
42a6f4ef30 tweak 2019-04-09 11:32:21 -04:00
Fox McCloud
06713d604f Atmos Define Cleanup + Plasma Tweaks 2019-04-09 11:22:01 -04:00
Ionward
ba7491fa49 cleaned up and made all mantles a child of the base mantle 2019-04-09 02:54:06 -07:00
Ionward
a792d46085 adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers. 2019-04-09 01:06:19 -07:00
Arkatos1
da73c134db Ghosts now orbit their followed targets 2019-04-09 02:17:40 +02:00
Fox McCloud
6557082d43 changes 2019-04-07 22:21:17 -04:00
Fox McCloud
061278224b derp 2019-04-07 21:31:30 -04:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc 
# Conflicts:
#	code/game/objects/items.dm
 2019-04-07 19:54:14 -04:00
Crazy Lemon
b59a5d37b6 Merge pull request #11266 from Markolie/hotkeymode 
Fix Hotkey Toggle button
 2019-04-07 14:16:06 -07:00
Mark van Alphen
91e6cb9347 Fix hotkey mode button 2019-04-07 18:42:08 +02:00
variableundefined
ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks 
[Goonchem] Reagent tweaks
 2019-04-07 21:22:18 +08:00
variableundefined
fc616d8a19 Merge pull request #11242 from Markolie/hotkeymode 
Hotkey mode handling is now instantaneous
 2019-04-07 21:21:21 +08:00
variableundefined
7da7902b29 Merge pull request #11249 from Fox-McCloud/updates-power-gloves 
Updates and Buffs Power Gloves
 2019-04-07 21:19:37 +08:00
farie82
9034f2a214 Merge branch 'master' into mhelp-ticket-system 2019-04-07 14:43:49 +02:00
variableundefined
525b28014c Merge pull request #11026 from farie82/popup-limiting 
Gives the option to limit the text popups to 1
 2019-04-07 20:41:24 +08:00
variableundefined
86ea35c25b Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit 
Terror Spider tweaks
 2019-04-07 20:30:48 +08:00
variableundefined
4f8494e89e Merge pull request #10999 from Kyep/ghost_verb 
Tweaks Ghost Verb
 2019-04-07 15:27:56 +08:00
Arkatos1
16a1a6d19a Shadowling text bolded in the Shadowling Hivemind 2019-04-07 04:06:47 +02:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Fox McCloud
8e0f0906a3 Merge remote-tracking branch 'upstream/master' into sr-update 2019-04-06 19:58:12 -04:00
Fox McCloud
12a09d46f1 Merge pull request #11239 from farie82/sec-hud-fix 
Perps no longer need glasses to be set
 2019-04-06 13:17:07 -04:00
Crazy Lemon
f6227ab2f8 Merge pull request #11223 from Fox-McCloud/fix-teslium 
Fixes Teslium Being Unmakeable
 2019-04-06 00:25:56 -07:00
Crazy Lemon
773d048919 Merge pull request #11237 from Fox-McCloud/fixes-reagents 
Fixes Reagents Not Updating
 2019-04-06 00:23:09 -07:00
Fox McCloud
afa4e751db Merge pull request #11195 from Twinmold93/tonerless_sending 
Fixes Sending Faxes Using Toner
 2019-04-06 03:15:53 -04:00
Fox McCloud
29002efd98 Updates and Buffs Power Gloves 2019-04-06 01:38:02 -04:00
Mark van Alphen
2ba56c33de Code review fix 2019-04-06 06:17:29 +02:00
Mark van Alphen
aa58a88296 Switch to client-side hotkey toggling 2019-04-05 22:45:05 +02:00
Arkatos1
5edc1378f8 New tips, renamed show tip verb, new Random Tip verb 2019-04-05 14:43:38 +02:00
joep van der velden
75d9852d33 Perps no longer need glasses to be set 2019-04-05 09:35:43 +02:00
Fox McCloud
7d5e09d97d Fixes Reagents Not Updating 2019-04-05 02:22:10 -04:00