cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 01:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,314 Commits 28 Branches 2 Tags
3d907490a84773fc2eb38345c01d5f461ec6582e
Commit Graph

3513 Commits

Author SHA1 Message Date
Fox McCloud
06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
datlo
d94210031b Refactor C4, subtypes, and airlock ex_act (#16995) 
* Refactor C4 and Airlock ex_act

* update uplink desc

* Replace ismob by carbon, clarify comment

* remove unnecessary ismob check

* replace destroy by qdel, fix comment

* auto doc comments, add else condition

* Add comment to shaped c4

* Shortens shaped boom proc, make airlocks more resistant against light ex
 2021-11-05 10:12:09 +01:00
variableundefined
5753d9067f Merge pull request #16933 from matttheficus/GoodbyeCQC 
Moves CQC to Nukies Only, Adds Combat Gloves Minus
 2021-11-02 23:31:26 -05:00
Fox McCloud
25477245d8 Merge pull request #17002 from paulo-e/fix/damage_converter 
fix(damage_converter): updates sprite when healed #16495
 2021-11-01 18:02:04 -04:00
Elienay Albuquerque
696e7ebf4e fix(damage_converter): updates sprite when cured 2021-10-28 08:46:53 -03:00
hal9000PR
cae70b2cb5 forgot this 2021-10-26 20:20:39 +01:00
hal9000PR
e5afa54965 Merge remote-tracking branch 'upstream/master' into bnuuy 2021-10-26 19:53:15 +01:00
hal9000PR
f095264807 bnuuy 2021-10-26 19:47:41 +01:00
AffectedArc07
f1fdaef0cc Cleanup from multi instance PR 2021-10-21 13:32:22 +01:00
AffectedArc07
e843d297bf Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-17 20:49:07 +01:00
variableundefined
9470fd0387 Merge pull request #16889 from AffectedArc07/cui-cdl 
Moves CUI entries to CDL
 2021-10-17 13:57:14 -05:00
variableundefined
909521c48d Merge pull request #16886 from Cocacolagua/unbreakable_stride 
Replaces clown magboots on the uplink with a new pair of slippers
 2021-10-17 13:40:07 -05:00
AffectedArc07
26a3dcd48b Tweaks 2021-10-17 19:36:40 +01:00
variableundefined
edd1781e38 Merge pull request #16943 from E-MonaRhg/more-carpets 
Carpet bomb your station: 8 more carpet types and a carpet cargo crate
 2021-10-17 13:30:03 -05:00
variableundefined
1c73b4f005 Merge pull request #16931 from AffectedArc07/new-rust-g 
Upgrades RUSTG
 2021-10-17 13:24:04 -05:00
AffectedArc07
712dcb8904 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-17 15:14:03 +01:00
matttheficus
2d35ca9c7e yeah theyre better than 5 2021-10-16 05:49:49 -04:00
SabreML
25c4275a16 get_display_key() client check (#16950) 2021-10-15 14:10:28 +01:00
E-MonaRhg
310616cdf3 Carpet bomb your local station 2021-10-14 20:23:11 +02:00
matttheficus
713befa77b so long farewell auf wiedersehen goodbye 2021-10-13 17:47:27 -04:00
AffectedArc07
500d70601d [WIP] Upgrades RUSTG 2021-10-13 22:00:37 +01:00
S34N
588f3fa795 Apply suggestions from code review 
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-10-12 22:50:29 +01:00
AffectedArc07
4ad5e41324 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-12 20:27:07 +01:00
S34NW
bb89924e6e more sanity checks 2021-10-11 20:48:43 +01:00
S34NW
04d0fb1c1f non-space priority 2021-10-11 20:44:21 +01:00
S34NW
8f4762e442 jaunting respects dense atoms on a turf too, no more AI core jaunting 2021-10-11 18:13:46 +01:00
Fox McCloud
d52fbfce20 Removes Null Entry/Surplus Crates (#16788) 2021-10-07 17:07:34 +01:00
Vi3trice
6cfbc3f396 Transformation diseases do the jobban check properly (#16881) 
* Make the jobban check work

* Removed gibbed
 2021-10-07 16:33:22 +01:00
AffectedArc07
3df98437c6 Moves CUI entries to CDL 2021-10-07 13:20:44 +01:00
Cocacolagua
cbcb09ac2e first review 2021-10-06 16:57:00 -03:00
Cocacolagua
b2fa47b372 slippers > sliders 2021-10-05 22:42:35 -03:00
Cocacolagua
c4af100155 finishing touches 2021-10-05 22:15:23 -03:00
Cocacolagua
92aea96dd1 Adds tactical slip shoes 2021-10-05 17:07:38 -03:00
datlo
2aa0abde72 Replace maintenance batswarm by regular bats (#16872) 2021-10-04 13:49:00 +01:00
variableundefined
25743018bb Merge pull request #16857 from S34NW/more_rogue_characters 
Fixes rogue characters in crew health monitor
 2021-10-03 20:49:15 -05:00
variableundefined
d25cafedb8 Merge pull request #16862 from FlattestGuitar/stealthmin-fixes 
stealthmin fix
 2021-10-03 20:46:03 -05:00
Mieszko Je
134a4bb663 stealthmin fix 2021-10-03 18:17:53 +02:00
S34NW
d2fdc83332 fixes rogue character in crew health monitor 2021-10-03 15:25:30 +01:00
AffectedArc07
7a0134e6e2 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-02 19:49:28 +01:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
Fox McCloud
9baf3e527d tweaks 2021-09-30 18:16:26 -04:00
Fox McCloud
4e0c76ac63 Merge remote-tracking branch 'upstream/master' into diagnostic-hud-fixes-and-upgrade 2021-09-30 18:16:10 -04:00
variableundefined
5a01a1fd92 Merge pull request #16738 from Qwertytoforty/A-crate-idea 
Adds a limit of 5 crates per round to null crates
 2021-09-23 18:32:51 -05:00
AffectedArc07
9c14b6b732 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-09-20 22:11:50 +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
8f1e2344fa Refactor modulator and horse mask to use the new speech change proc 2021-09-19 07:42:58 -07:00
Stokes52
9160dfa3fe Implement fixes to modulator mask from code review 2021-09-19 07:42:54 -07:00
Stokes52
6c3675ad0c Add voice modulator mask for crafting and traitor uplink 2021-09-19 07:42:21 -07:00
Qwertytoforty
972040c0eb Adds a limit to null crates 2021-09-19 10:28:17 -04: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