cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 07:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,489 Commits 26 Branches 2 Tags
96840368d40f49d172cb15c39cc9a9cb8c835615
Commit Graph

21838 Commits

Author SHA1 Message Date
mochi
4e6447976a Merge branch 'master' into character-slot-clearing 2020-07-13 21:04:20 +02:00
mochi
763fcb909d ugh 2020-07-13 21:04:13 +02:00
Fox McCloud
af8dde611e Merge pull request #13829 from dearmochi/fix-zero-damage-overlay 
Fix damage overlay showing up when hit with 0 damage
 2020-07-13 14:52:00 -04:00
mochi
07e8b9d25a Fix damage overlay showing up when hit with 0 damage 2020-07-13 20:39:53 +02:00
Fox McCloud
955602fb16 Merge pull request #13599 from AffectedArc07/nanomaps-github-action 
NanoMaps GitHub Action
 2020-07-13 14:25:39 -04:00
Fox McCloud
71fb28905b Merge pull request #13806 from DaveKorhal/FixWestShots 
Fixes drift on projectiles firing west
 2020-07-13 14:21:50 -04:00
Fox McCloud
de0c606969 Merge pull request #13502 from AffectedArc07/hook-kill-v10-final-ultimate-final 
HOOKS ARE DEAD
 2020-07-13 13:55:04 -04:00
Autumn211
e763dd70af Makes job berets have no overlap cost in loadout 2020-07-13 16:06:24 +01:00
Fox McCloud
ee957870bb Ticket Machine Fixes (#13821) 2020-07-12 19:28:10 -06:00
TDSSS
4deb4e7969 formatting change 2020-07-13 00:31:53 +02:00
Fox McCloud
40f3d7aa6e Makes Ticket Machine Use Soft Refs (#13819) 2020-07-12 14:02:47 -06:00
Fox McCloud
dd374ec1bd Merge pull request #13634 from ZomgPonies/ticketplease 
Ports HoP Ticket machine from tg
 2020-07-12 15:47:44 -04:00
AffectedArc07
390e41e91d The elephant: Ruin + Whiteship rework (#13632) 
* The elephant: Ruin + Whiteship rework

* ROUND TWO: FIGHT

* Forgot this

* Kyet Fixes

* [NEEDS TESTING] Tweaks from new knowledge

* Adds to Meta, Removes from Delta

* This isnt needed anymore

* Adds in one empty space level

* Area tweaks
 2020-07-12 13:44:58 -06:00
AffectedArc07
014dbd95d9 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-07-12 09:27:33 +01:00
AffectedArc07
d50040f143 Merge branch 'master' into nanomaps-github-action 2020-07-12 09:25:35 +01:00
Fox McCloud
7a946ef883 Fixes Alien Larva Being Unconscious by Default (#13812) 2020-07-11 23:53:11 -06:00
Fox McCloud
e8deb47865 Merge pull request #13789 from AffectedArc07/proc-call-safety 
Adds proc call security
 2020-07-11 22:25:02 -04:00
Fox McCloud
962d870da5 Merge pull request #13797 from dearmochi/fix-syringe-gun-chamber 
Fix syringe gun chambering weirdness
 2020-07-11 22:23:02 -04:00
DaveKorhal
b67f03d017 Update projectile.dm 
Added variable to offset rounding so that it actually rounds to the closest number instead of flooring it to the next lowest integral.
 2020-07-11 16:16:13 -05:00
AffectedArc07
650c638d41 Removes semicolons 2020-07-11 18:51:45 +01:00
AffectedArc07
efc7fa888f Log message change 2020-07-10 20:59:18 +01:00
variableundefined
d0f84ec48a Merge pull request #13791 from Fox-McCloud/ice-cream-gc 
Makes Ice Cream GC
 2020-07-10 14:28:15 -04:00
joep van der velden
e370437e95 Magic wabbajack included as well 2020-07-10 15:21:01 +02:00
joep van der velden
55b7c6ece0 Makes sure borgs actually sync and unsync correctly to the AI 2020-07-10 15:19:47 +02:00
mochi
4d4a756487 Fix syringe gun chambering weirdness 2020-07-10 13:11:22 +02:00
mochi
fafdd8db81 Don't re-use same query 2020-07-10 11:31:02 +02:00
mochi
7b93bc3b9c Merge branch 'master' into character-slot-clearing 2020-07-10 11:30:00 +02:00
Fox McCloud
dfef1a5053 Merge pull request #13767 from AffectedArc07/ui-assets-verb 
Allows clients to reload their UI assets
 2020-07-10 03:59:43 -04:00
Fox McCloud
ba83975297 Merge pull request #13709 from farie82/drones-no-camms 
Makes maint drones not have a camera
 2020-07-10 02:30:14 -04:00
Fox McCloud
38c9c508e6 Makes Ice Cream GC 2020-07-09 11:03:12 -04:00
AffectedArc07
608c71c6e5 Adds proc call security 2020-07-09 10:29:51 +01:00
Fox McCloud
07597b9480 Merge pull request #13326 from AzuleUtama/slipStaffNerf 
Lowers max charges and recharge time for Staff of Slipping
 2020-07-08 19:20:28 -04:00
TDSSS
35de1f63bc Added security counter to check antags panel 2020-07-08 14:28:04 +02:00
Fox McCloud
5b85c79b8f Merge pull request #13577 from trololiver112/Chef-can-buy-CQC 
Gives the Chef the CQC manual as a traitor item
 2020-07-07 13:49:52 -04:00
Fox McCloud
1ec53a35b3 Merge pull request #13615 from TDSSS/xray-rnd 
change tech requirement for xray implant
 2020-07-07 13:41:58 -04:00
SteelSlayer
4305d1daea Fixes incorrect APC terminal orientation 2020-07-06 18:29:29 -05:00
mochi
272ad7f40f Address farie 2020-07-06 19:47:04 +02:00
mochi
05eb6c2f0e Merge branch 'master' into dmm-suite-refactor 2020-07-06 19:42:01 +02:00
Terilia
faeaab739b And adjusting the scope to reset the cycles. 2020-07-06 12:36:38 +02:00
Terilia
d58dce3bb0 Fixed the very obvious and annoying bug 2020-07-06 12:29:36 +02:00
variableundefined
c0587b7e07 Merge pull request #13770 from Fox-McCloud/new-player-gc-continued 
Further New Player GC Fixes
 2020-07-06 03:24:21 -04:00
Fox McCloud
23e594b246 Merge pull request #13773 from Gatchapod/hydro-SR-fix 
Fixes SR spawning mobs in nullspace instead of hydroponics trays
 2020-07-05 14:38:32 -04:00
Gatchapod
5cfc0e1e85 this is objectively a superior way of doing it 2020-07-05 20:01:06 +02:00
Gatchapod
4fd4a949aa no more nullspace tomatoes and trees 2020-07-05 15:06:04 +02:00
AffectedArc07
1283bc9022 Message Tweaks 2020-07-05 08:35:45 +01:00
Fox McCloud
e3793a14ee Further New Player GC Fixes 2020-07-05 01:21:09 -04:00
variableundefined
a545a13ed4 Merge pull request #13747 from Fox-McCloud/new-player-gc 
Makes New Players GC
 2020-07-04 21:27:15 -04:00
variableundefined
eaee2365ea Merge pull request #13742 from Fox-McCloud/fix-mob-init-args 
Fixes Mob Init Arguments and Returned Values
 2020-07-04 21:23:12 -04:00
Fox McCloud
cb29647522 Merge pull request #13761 from farie82/ai-fixes 
Fixes borgs being given to the last AI and a runtime
 2020-07-04 17:17:57 -04:00
AffectedArc07
f8c74b95f9 Mochi Tweaks 2020-07-04 21:37:29 +01:00