cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 13:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,685 Commits 26 Branches 2 Tags
06ef8c94de23b2be6576f61ef4c3c70fea3a82e6
Commit Graph

21922 Commits

Author SHA1 Message Date
trololiver112
e770103b72 commented 2020-06-15 22:17:22 +02:00
trololiver112
a843221617 Procced 2020-06-15 19:25:23 +02:00
AffectedArc07
559f907e9c Fixes shuttle exploit 2020-06-15 10:21:48 +01:00
mochi
abb25ba760 HUDs gotta take their atom's alpha after all 2020-06-14 21:16:48 +02:00
mochi
46aea3f0dc Fix HUDs taking parent atom's color/alpha 2020-06-14 21:00:29 +02:00
TDSSS
1c6234cf31 change tech requirement for xray implant 2020-06-14 19:55:23 +02:00
Luca
266a422e05 Merge conflict solved(?) 2020-06-14 01:50:07 +10:00
CornMyCob
29900a8111 resolve conflicts 2020-06-13 15:17:51 +01:00
CornMyCob
6b07ef7e0b pointless comment 2020-06-13 15:06:48 +01:00
CornMyCob
afc682436c better clean_blood proc 2020-06-13 15:02:05 +01:00
Moku Moku
07f085a6c4 Correcting Welder Messages on the Field Generator. 
This simply swaps WELD and SLICE messages that were previously incorrect to instead reflect as to what they should actually do.
Hopefully this can clear up some confusion for players, aswell as making it just look cleaner.
 2020-06-13 15:19:59 +02:00
Kyep
0180b1724a more logging 2020-06-13 00:18:49 -07:00
Kyep
6e6414071a spacing, true/false 2020-06-13 00:09:55 -07:00
SteelSlayer
177152e9ed Adds some more action buttons for malf AI abilities, removes the malfunction tab 2020-06-12 15:18:15 -05:00
AffectedArc07
acda7bd107 Forgot this 2020-06-11 12:29:55 +01:00
AffectedArc07
c76a519eaa GitHub action for NanoMap generation 
Number 1

Number 2

Number 3

God I wish there was a decent way to test these

AAAAAAAAA

Begin the null diffs

Oh ffs wrong branch

chmod

Forgot to mod the renderer itself

Number 23452354235

It just keeps going

I think this might be it

Lets try that again

aaaaaaaaaa

*scream

*sigh

Dont tell me that a newline broke it

...

aaaaaaaaaaaaa

*scream

This worked

THATS WHAT KILLED IT?!?!?!?!?!?!?!?

...

I THINK ITS READY

Ok final commit

Line endings are the bane of my existence

This has really made me feel stupid

CRLF AAAAAAAAAA

Changes DM side
 2020-06-11 12:27:21 +01:00
mochi
7aba081bc6 Use bots_list instead of simple_animals[AI_ON] 2020-06-10 09:16:38 +02:00
Fox McCloud
c00d4eda88 Merge pull request #13558 from SteelSlayer/slippery-component 
Adds the slippery component
 2020-06-09 23:12:59 -04:00
mochi
657e78b7e0 Remove space between if and ( 2020-06-10 00:00:05 +02:00
mochi
d03aee7131 Semi-colons begone 2020-06-09 23:49:35 +02:00
mochi
89eedce967 Stop grab on buckle, remove redundant code 2020-06-09 21:43:42 +02:00
Fox McCloud
bcc45f03b7 Cuts down on Pointless Status Effect Processing (#13582) 2020-06-09 15:31:10 -04:00
mochi
f8b76f0a64 Allow grab on buckled people, fix visuals 
The code previously printed a message saying
the user can't grab a buckled mob, but still
allowed them to. This commit removes that
message and fixes the visual bugs that come
with grabbing (or ungrabbing) buckled mobs
 2020-06-09 14:29:03 +02:00
mochi
db1bfd18fc Fix Cleanbots not showing on PDA app, touch up UI 2020-06-09 14:29:03 +02:00
Fox McCloud
01a5723f8c [s] Fixes Ghost Exploit (#13580) 2020-06-08 19:57:07 -06:00
Fox McCloud
f6a3a44cb3 Adds Swarming Component 2020-06-08 19:38:12 -04:00
trololiver112
34bfd891e7 Removes CCQC.remove 2020-06-08 22:03:15 +02:00
trololiver112
344226b2b4 Gives the Chef the CQC manual as a traitor item 2020-06-08 20:51:43 +02:00
Fox McCloud
38403e1bc7 Fixes Shoe Shackle Handcuff Upgrading (#13568) 
* Fixes Shoe Shackle Handcuff Upgrading

* better
 2020-06-07 17:26:23 -06:00
Fox McCloud
73e8781b0a Fixes Excessive PDA Creation (#13561) 2020-06-07 16:52:44 -06:00
Fox McCloud
40968ce907 Dramatically Cuts Object Processing Down (#13564) 2020-06-07 15:32:25 -06:00
Fox McCloud
f4a0790514 Organ processing performance (#13534) 
* Organ Processing Performance

* more optimization

* indentation error

* More OOP

* compensation buff
 2020-06-07 14:29:52 -06:00
joep van der velden
346a8c8020 Ticket conversion possible + refactor 2020-06-07 00:56:43 +02:00
SteelSlayer
7088de6bab slippery component 2020-06-06 15:35:12 -05:00
mochi
49bf339129 Add some padding to View Asays table cells 2020-06-06 15:56:40 +02:00
mochi
28e115ce7d Comment and tweak new topics, add borders to asays 
Use Random Name now assigns a random name to the mob/char preferences
Add borders to View Asays table
Increase View Asays table size to 1200x825
Forgot to add View Asays to verb list again, whoops
 2020-06-06 15:38:52 +02:00
AffectedArc07
809c09f969 Fixes karma shop 2020-06-06 12:16:01 +01:00
mochi
960bac6976 View Asays, Erase Flavor Text and Use Random Name 2020-06-06 09:37:48 +02:00
farie82
239ed08caf Merge branch 'master' into afk-subsystem-2 2020-06-06 07:01:34 +02:00
AffectedArc07
64f127526d Programmatic Profiler Access (#13524) 
* Programmatic Profiler Access

* Why do I never proof-read until submitting
 2020-06-05 21:50:58 -06:00
Patrick Meade
a2ecd79be7 Rework power outage event (#13117) 
* Rework power outage event

* Added compile time flag for event fixing itself when it ends

* Review Cleanup 1

* Fixed up line ending conflicts

* Going whole hog with a side of bacon

* Whoops, forgot the sausage and Canadian Bacon

* Better messaging and makes APC Overload an offical non-random event

* Test merge feedback rework
 2020-06-05 21:41:52 -06:00
Fox McCloud
27756b0e25 Merge pull request #13490 from farie82/flash-and-camera-flash 
Gives flashes and cameras a light flash
 2020-06-05 23:18:47 -04:00
Fox McCloud
55d3a318be Merge pull request #13469 from ZomgPonies/karma 
Karma menu update
 2020-06-05 23:07:48 -04:00
Fox McCloud
250346d888 Merge pull request #13532 from AffectedArc07/removes-what-shouldnt-exist 
Removes something which shouldnt really exist here
 2020-06-05 20:56:11 -04:00
Fox McCloud
fad1e90499 Merge pull request #13528 from AffectedArc07/station-renaming 
Renames the old station Delta wing to Theta
 2020-06-05 20:42:51 -04:00
Fox McCloud
2b85a73d3e Merge pull request #13519 from farie82/light_construct-fix 
Make light_constructs use X_acts. Fixes a runtime
 2020-06-05 20:01:31 -04:00
Fox McCloud
de40c33d2a Merge pull request #13543 from SteelSlayer/princess-health-hud-fix 
Terror queens that evolve from princesses will now be able to see their medhud properly
 2020-06-05 19:37:45 -04:00
Fox McCloud
cbd3a3f96c Merge pull request #13539 from farie82/tcomms-log-fix 
Fix AI say logging and cult logging
 2020-06-05 19:35:13 -04:00
Fox McCloud
77ffb3f102 Various Life Refactor Fixes (#13536) 
* Disposal Movement Fix

* guardian fix

* SSD fix

* blob mobs

* wizard teleport fix
 2020-06-05 16:38:45 -06:00
SteelSlayer
34996bf36e hud fix 2020-06-04 21:19:14 -05:00