cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,753 Commits 26 Branches 2 Tags
890e7e5ce5f91ca0878ebf8a01a67978a172ebfa
Commit Graph

38536 Commits

Author SHA1 Message Date
AffectedArc07
890e7e5ce5 I think this is instance communication 2021-09-20 23:50:51 +01:00
AffectedArc07
9c14b6b732 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-09-20 22:11:50 +01:00
Fox McCloud
ca6f253aa6 Merge pull request #16449 from AffectedArc07/client-data-loading 
Refactors client data loading
 2021-09-20 15:16:55 -04:00
Farie82
c547a8091f Allow the game to call votes whenever (#16751) 2021-09-20 19:15:28 +01:00
AffectedArc07
2c5276dbb9 Fox tweaks 2021-09-20 19:14:04 +01:00
S34NW
7f6d313162 Merge branch 'master' into directional_compooters 2021-09-19 21:13:53 +01:00
variableundefined
5339cdf212 Merge pull request #16659 from Fox-McCloud/the-end-of-lethal-shot 
Nerfs Shotguns
 2021-09-19 11:25:02 -05:00
Stokes52
21aec6ec03 Move mask verb change down so it takes precedence 2021-09-19 07:43:01 -07:00
Stokes52
119385057b Apply changes from AffectedArc's code review 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-09-19 07:43:00 -07:00
Stokes52
995fe5877e Apply suggestions from code review: Cleaner if statement 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-09-19 07:42:59 -07:00
Stokes52
8f1e2344fa Refactor modulator and horse mask to use the new speech change proc 2021-09-19 07:42:58 -07:00
Stokes52
03013e5945 Add a generic proc for changing speech verb when wearking a mask 2021-09-19 07:42:56 -07:00
Stokes52
fc5dabe1fb Move modulator voice logic out of for loop so it has priority 2021-09-19 07:42:55 -07:00
Stokes52
9160dfa3fe Implement fixes to modulator mask from code review 2021-09-19 07:42:54 -07:00
Stokes52
4942ef2444 Update lootdrop values to match the new items added 2021-09-19 07:42:53 -07:00
Stokes52
6c3675ad0c Add voice modulator mask for crafting and traitor uplink 2021-09-19 07:42:21 -07:00
variableundefined
68ec0020be Merge pull request #16731 from hal9000PR/gun-light-runtime-fix 
Gunlight runtime fix
 2021-09-18 18:48:13 -05:00
variableundefined
2e3f95f22e Merge pull request #16730 from SabreML/reagent-name-capitalisation 
Capitalises some lowercase reagent names
 2021-09-18 18:44:05 -05:00
hal9000PR
bf04ec4b34 fix 2021-09-18 23:44:10 +01:00
variableundefined
522390c0b9 Merge pull request #15675 from Fox-McCloud/his-grace-ascended 
Implements Better His Grace
 2021-09-18 15:26:30 -05:00
SabreML
a0fef16d3e Reagent name capitalisation 2021-09-18 18:11:44 +01:00
hal9000PR
3c52cea099 fix (#16728) 2021-09-18 15:36:35 +01:00
variableundefined
c2eb9f1ee9 Merge pull request #16722 from SabreML/game-panel-create-x 
Makes the game panel window title more descriptive
 2021-09-17 22:24:20 -05:00
variableundefined
5ca3a34d3b Merge pull request #16720 from Qwertytoforty/grabbing-your-attention 
Makes revive, biodegrade, and freedom break grabs
 2021-09-17 22:12:08 -05:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
variableundefined
a271eb71a6 Merge pull request #16672 from botka4aet/BoneItems 
New tribal craft items(pickaxe and scythe)
 2021-09-17 21:34:35 -05:00
variableundefined
a52b8ea20f Merge pull request #16721 from Qwertytoforty/za-world 
Moves existing_station_areas to SSmapping, to prevent midround lag
 2021-09-17 21:33:46 -05:00
variableundefined
454ce66eea Merge pull request #16679 from SabreML/progress-bar-HUD-layer 
Makes progress bars render above the game HUD
 2021-09-17 21:15:16 -05:00
variableundefined
d0785adc20 Merge pull request #16700 from Qwertytoforty/thinking-with-cult-portals 
Adds an item that lets cultists turn teleport runes into portals
 2021-09-17 21:14:27 -05:00
SabreML
597d667dfa Fixes some chugging-related bugs (#16475) 
* Chugging-related fixes

The word "chug" doesn't sound real anymore

* Drinks can fix

#16500
 2021-09-17 21:03:08 -05:00
variableundefined
dfbba739c6 Merge pull request #16725 from SabreML/wrapping-teleportation 
Fixes package wrapper teleportation
 2021-09-17 20:44:54 -05:00
variableundefined
3a0f05d0f0 Merge pull request #16724 from SabreML/targetted-drones 
Targetted drone announcement fix
 2021-09-17 20:42:48 -05:00
variableundefined
018589c542 Merge pull request #16703 from roarbark/wt550-ap-buff 
Increases armour piercing for the WT550 AP magazines.
 2021-09-17 20:41:17 -05:00
variableundefined
6cbb29beb2 Merge pull request #16702 from SabreML/ghost-poll-names 
Fixes some ghost poll chat messages being incorrect
 2021-09-17 20:39:58 -05:00
variableundefined
44308cbc44 Merge pull request #16714 from SteelSlayer/claw-machine-fix 
Fixes the Claw Game arcade machine being impossible to deconstruct.
 2021-09-17 20:37:18 -05:00
variableundefined
cc29b0f7ad Merge pull request #16711 from Vi3trice/and-my-axe 
Fix - Removes twohanded wielding when equipping the item to a different slot
 2021-09-17 20:34:13 -05:00
variableundefined
5a1736852c Merge pull request #16709 from Vi3trice/awaken-my-masters 
Fix - Set nymph's evolve icon
 2021-09-17 20:31:58 -05:00
roarbark
8156f4b13a code looks uniform now. praying to god that people dont get emails for this. 2021-09-18 02:01:33 +02:00
roarbark
9a290b4e7a whoops, the 9mm armourpiercing is now back to 10 AP 2021-09-18 01:51:06 +02:00
roarbark
69fd8f9b9a Revert "Revert "new subtype, changed values"" 
This reverts commit bf150bdfac.
 2021-09-18 01:46:57 +02:00
roarbark
bf150bdfac Revert "new subtype, changed values" 
This reverts commit ae99d900e7.
 2021-09-18 01:25:39 +02:00
roarbark
ae99d900e7 new subtype, changed values 2021-09-18 01:17:58 +02:00
SabreML
867cfb24f5 attack_self() cleanup, since it was in the original commit. 2021-09-17 17:45:36 +01:00
SabreML
21f59bb4ab Package wrapper teleportation fix 2021-09-17 17:45:01 +01:00
SabreML
11941d7791 Target 2021-09-17 16:25:27 +01:00
botka4aet
ebf20f8806 Bone items review fix 2021-09-17 11:13:32 +03:00
variableundefined
537b72daaf Merge pull request #16717 from Fox-McCloud/earthsblood-nerf 
Nerfs Earthsblood
 2021-09-16 21:18:28 -04:00
variableundefined
3ebd3334ce Merge pull request #16716 from Fox-McCloud/botany-nerf 
Removes Separated Chemicals
 2021-09-16 21:18:17 -04:00
SteelSlayer
950b64c9af !panel_open check 2021-09-16 20:09:18 -05:00
variableundefined
212f65672d Merge pull request #16705 from SabreML/ant-protection 
Prevents ants from infesting wrapped/packaged food
 2021-09-16 20:52:10 -04:00