cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 02:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,290 Commits 26 Branches 2 Tags
24e8cd66aca8fa1920fec321bfdbd976ffc694df
Commit Graph

21739 Commits

Author SHA1 Message Date
mochi
24e8cd66ac Port Baystruments PR from tgstation 2020-07-17 15:18:17 +02:00
Oyu-De
d634ac5e1a Spelling mistake correction 2020-07-15 22:14:50 +03:00
AffectedArc07
2555c365c3 Removes duplicate helper 2020-07-15 15:55:19 +01:00
Fox McCloud
7ee39d83a8 Merge pull request #13779 from Terilia/heacrabcyclefixing 
Headcrab Cycle Fix
 2020-07-14 10:00:53 -04:00
Fox McCloud
50eba96666 Merge pull request #13832 from dearmochi/fix-syringe-gun-clip-size 
Fix bug that allows loading an additional syringe to syringe guns
 2020-07-14 09:26:24 -04:00
Terilia
530c000120 Added the modulo operator - who would have thought that is faster :D 2020-07-14 10:59:12 +02:00
mochi
273a3e7b23 Fix syringe gun allowing one syringe more than normal 2020-07-14 09:13:42 +02:00
Fox McCloud
ab9e099fdf Merge pull request #13831 from SteelSlayer/mind-cleanup 
Removes some unused vars and a proc from minds
 2020-07-14 00:22:02 -04:00
SteelSlayer
d75d29191a mind cleanup 2020-07-13 22:18:04 -05:00
trololiver112
5847265d6e Janiborgs can no longer clean while dead (#13818) 
* janiborg clean

* whoops

* foxMcFix
 2020-07-13 22:35:51 -04:00
Fox McCloud
b88bb469d8 Merge pull request #13799 from farie82/robot-sync-fix 
Makes borgs (dis)connect properly to the AI. Fixing invisible borgs for the AI and a runtime or more
 2020-07-13 16:30:07 -04:00
Fox McCloud
45b9acb161 Merge pull request #13785 from TDSSS/security-counter 
Added security counter to check antags panel
 2020-07-13 16:04:02 -04:00
SteelSlayer
e8b64acaab Adds the airlock painter (#12687) 
* Adds the airlock painter

* 5 am push, pls don't break

* uses assoc lists, add do_after, painter attack_self

* more upgrades

* remove random whitespace

* better logic

* initial over new, flags, manually sort the list

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
 2020-07-13 15:52:34 -04:00
Fox McCloud
66cc24f558 Merge pull request #13645 from dearmochi/dmm-suite-refactor 
Refactor dmm_suite for readability
 2020-07-13 15:37:23 -04:00
Fox McCloud
5cb34328c6 Merge pull request #13753 from SteelSlayer/lwap-update 
Gives the L.W.A.P in-hand sprites; Some tweaks to the gun, and the "toggle scope" action button
 2020-07-13 15:33:54 -04:00
Fox McCloud
1ce2b1e4cd Merge pull request #13680 from dearmochi/character-slot-clearing 
Add character slot clearing
 2020-07-13 15:12:12 -04:00
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
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