cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,480 Commits 26 Branches 2 Tags
64fa0dbe3d3ca368559ebbc41ffe1d3fd0bdc796
Commit Graph

23724 Commits

Author SHA1 Message Date
AffectedArc07
3d8c6d1bd3 Removes some macro abuse 2021-09-08 20:52:24 +01:00
variableundefined
dedbe9166e Merge pull request #16625 from Fox-McCloud/spin-changes 
Spin Emote Changes
 2021-09-08 08:52:15 -05:00
variableundefined
81688b2de7 Merge pull request #16643 from LightFire53/Console-Fixes 
Console Minor Fixes
 2021-09-08 08:36:15 -05:00
variableundefined
4fa2aafbc8 Merge pull request #16644 from SteelSlayer/wand-of-slipping 
Gives the wand of slipping a unique sprite and fixes a bug with it
 2021-09-08 08:33:24 -05:00
Fox McCloud
be49c778cf Merge pull request #16647 from AffectedArc07/514-patch 
The 514 patch
 2021-09-08 09:14:26 -04:00
Fox McCloud
1d47d4a93c Merge pull request #16648 from AffectedArc07/mutes-glob 
Moves mutes to a GLOB
 2021-09-08 09:01:13 -04:00
Fox McCloud
24f97f62eb tweaks 2021-09-08 08:56:57 -04:00
AffectedArc07
99e58c6c0f Apply suggestions from code review 2021-09-07 20:49:33 +01:00
AffectedArc07
8b23fc8726 And this 2021-09-07 17:52:18 +01:00
AffectedArc07
b0e9db64bd Revert "Merge pull request #16520 from SabreML/fix-bundle-4" 
This reverts commit 9a62622fbc, reversing
changes made to 841ad0f1fd.
 2021-09-07 16:16:40 +01:00
AffectedArc07
abcbee215b Fixes all players being marked as blobs 2021-09-07 15:35:05 +01:00
AffectedArc07
fce2828724 Moves mutes to a GLOB 2021-09-07 15:09:37 +01:00
AffectedArc07
04e3481bf3 The 514 patch 2021-09-07 11:43:42 +01:00
variableundefined
3dae44217a Merge pull request #16383 from theo-3/seeds_naming 
Allows players to name seed packs to keep track of modified plants
 2021-09-06 23:17:53 -05:00
variableundefined
c2664eec0d Merge pull request #16311 from S34NW/does-anyone-else-hate-genetics 
Replaces genetics xray vision with other vision genes
 2021-09-06 23:16:04 -05:00
variableundefined
b0ca2e366a Merge pull request #15971 from S34NW/AI_announcer_new 
Revamps "Station AI" announcer
 2021-09-06 23:14:27 -05:00
variableundefined
d014aaafb0 Merge pull request #16635 from Sirryan2002/DrinkRecipeFix 
Adds Sugar to Gimlet Drink Recipe
 2021-09-06 22:53:58 -05:00
variableundefined
5ffc8e2625 Merge pull request #16632 from SteelSlayer/robot-move-refactor 
Minor cyborg Move refactor
 2021-09-06 22:53:19 -05:00
variableundefined
9a62622fbc Merge pull request #16520 from SabreML/fix-bundle-4 
Fix bundle #4
 2021-09-06 22:29:10 -05:00
variableundefined
841ad0f1fd Merge pull request #16609 from SabreML/GC-fixes-1 
GC fix bundle #1
 2021-09-06 22:15:44 -05:00
variableundefined
82b34ad8ed Merge pull request #15783 from E-MonaRhg/just-defibrillator-things 
More compact defibs: Electric boogaloo
 2021-09-06 21:56:46 -05:00
variableundefined
5a9b70b7fb Merge pull request #16447 from S34NW/outline_port 
Ports item hover outline
 2021-09-06 21:42:50 -05:00
variableundefined
df778ab8fb Merge pull request #16621 from Qwertytoforty/anomalys-of-highest-quality 
Makes anomalies able to spawn in more areas
 2021-09-06 21:40:16 -05:00
variableundefined
cf5544846b Merge pull request #16613 from Qwertytoforty/transforming-views 
Removes transformation sting
 2021-09-06 21:40:06 -05:00
variableundefined
842f8267b2 Merge pull request #16510 from theo-3/bee_hitbox 
Make bee hitbox much smaller, except if the bee attacks someone
 2021-09-06 19:12:20 -05:00
variableundefined
2354619f17 Merge pull request #16525 from S34NW/glass_floors_2 
Glass floors attempt 2
 2021-09-06 19:10:44 -05:00
LightFire53
2531a8ce89 Black magicks 
Told by S34N that this will fix an issue with solar control consoles being bugged visually
 2021-09-06 16:46:07 -07:00
variableundefined
85c8e96db9 Merge pull request #16626 from AffectedArc07/removes-warning-system 
Removes bay-era warning system
 2021-09-06 14:30:40 -05:00
E-MonaRhg
23e9083d07 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-09-06 19:47:03 +02:00
SteelSlayer
3cc83e6011 wand of slipping fixes 2021-09-06 12:23:27 -05:00
variableundefined
dd17035c1f Merge pull request #16567 from SabreML/fluorescent-lights 
Adds a short warm-up time when turning on a light
 2021-09-05 16:05:21 -05:00
variableundefined
58af5b79a5 Merge pull request #16564 from S34NW/tg_machinery_port 
TG sprite project: Vendors and Consoles.
 2021-09-05 16:04:10 -05:00
Sirryan2002
2d3f02e795 Changes Gimlet Recipe + Result Amount 2021-09-04 16:06:34 -04:00
SteelSlayer
dec01b62e3 robot move refactor 2021-09-03 08:47:30 -05:00
SabreML
b2ab2cfbd8 Fix 2021-09-03 14:24:56 +01:00
AffectedArc07
633a8bcfa5 Removes bay-era warning system 2021-09-03 13:16:49 +01:00
SabreML
e9f807fa3b More reviews 
The bat faction needs to use \ref, since the faction check system uses that too.
 2021-09-02 21:05:18 +01:00
Fox McCloud
8fceeb0faa tweak 2021-09-02 14:28:35 -04:00
Fox McCloud
0af3fc340c Spin Emote Changes 2021-09-02 14:17:21 -04:00
Luc
db067fabeb Ensures rev heads are shown in ahud orbit menu (#16624) 
Co-authored-by: chafla <namen937@gmail.com>
 2021-09-02 18:55:38 +01:00
SabreML
c122e67693 Merge remote-tracking branch 'upstream/master' into fix-bundle-4 2021-09-02 17:48:42 +01:00
Qwertytoforty
2cd9063e70 Allows status to output the round ID (#16610) 
* Allows status to output the round ID

* Spacing is good for clarity
 2021-09-02 14:34:47 +01:00
variableundefined
2225fff357 Merge pull request #16574 from S34NW/brain_damage_avoidance_fix 
Fixes bug with species organ list
 2021-09-01 20:02:22 -05:00
variableundefined
50ec519bcd Merge pull request #16320 from thatdanguy23/newdrinks 
six new drinks
 2021-09-01 19:49:20 -05:00
variableundefined
12b6c6973f Merge pull request #16506 from SabreML/dragging-tweaks 
Fixes 'Face while pulling' oversights
 2021-09-01 19:47:29 -05:00
variableundefined
936fbf3194 Merge pull request #16601 from Qwertytoforty/wii-sports-annoucer 
Adds antimatter sniper rounds, buffs bleeding rounds, nerfs base sniper rounds
 2021-09-01 19:46:04 -05:00
variableundefined
188496c678 Merge pull request #16595 from SabreML/clothing-migration 
[IDB IGNORE] Clothing .dmi file organisation
 2021-09-01 19:44:59 -05:00
variableundefined
abe072f936 Merge pull request #16596 from S34NW/right-click-rearrange 
Makes admin verbs easier to see on the context menu
 2021-09-01 19:43:56 -05:00
variableundefined
5875fd703a Merge pull request #16600 from PacifistDalek/dutch-food 
Adds Stroopwafels
 2021-09-01 19:42:17 -05:00
Qwertytoforty
34bf1a5fe8 Removes notranssting flag 2021-09-01 13:27:28 -04:00