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

35171 Commits

Author SHA1 Message Date
Fox McCloud
184face3cc Merge pull request #13576 from SteelSlayer/ragin-mages-fix 
Fixes wizards on ragin mages being able to buy restricted spells
 2020-07-13 15:39:42 -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
Pidgey
3095a3468e Makes Chicken Man statues in Mr. Chang's into real statues (#13721) 
* I think this is ok?

* Chicken Man and Kidan statues are now real statues that can be moved and disassembled (disassembly causes them to vanish without dropping materials as there are no bronze or obsidian stacks). Moved their sprites from decorations to statues for consistency.

* Oops! Metastation too.

* Finally got everything sorted out. Phew!

* The OXENbot on the derelict station is no longer a renamed chicken man statue. It can also be unanchored and sliced up for metal should you be inclined to do so.

* What even is this? Delete this.

* Coding standards

* Removed density variables from the changed statues.

* Fixes conflicts
 2020-07-13 14:23:56 -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
cbb832e4ca Merge pull request #13633 from AzuleUtama/darkGygaxTweaksAgain 
Fixes being able to 'stack' repairs on mechs
 2020-07-13 14:20:52 -04:00
Fox McCloud
cc4343d282 Merge pull request #13824 from AffectedArc07/tcomms-fixes-2 
More Tcomms Fixes
 2020-07-13 13:57:47 -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
AffectedArc07
d9d97b6cc6 More Tcomms Fixes 2020-07-13 11:26:17 +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
a86b5e6834 Lavaland Atmos Fixes (#13783) 2020-07-12 14:31:39 -06:00
Fox McCloud
48fbdda84b Standardizes Holodeck (#13701) 
* Standardizes Holodeck

* fixe and real space

* last errors

* map update

* fix

* console fix

* mapping error
 2020-07-12 14:25:08 -06: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
f71e66f428 Merge pull request #13760 from denghis1/bugfix_syndicate_bomb_defusal 
bugfix syndicate bomb not triggering defuse properly
 2020-07-11 22:26:45 -04: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
TDSSS
22f133ec25 Build time for windows and co 2020-07-12 03:33:08 +02: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
Kyep
cf3e26f670 Notify admins when AI core is created (#13801) 
* notify admins when an ai core is created

* add co-ords

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-07-11 02:42:30 -06:00
farie82
3a5abbf8d1 Fixes cling eyes runtiming if you lack eyes (#13798) 2020-07-11 02:37:33 -06:00
farie82
bd2fb61eff Use UID instead of \ref (#13803) 2020-07-11 02:35:31 -06:00
DaveKorhal
07cee420a3 Scoreboard: Score and Rating Cleanup (#13696) 
* Update scoreboard.dm

* Update scoreboard.dm

Co-authored-by: DaveKorhal <davekorhal@gmail.com>
 2020-07-11 01:20:25 -06:00
Fox McCloud
b59b5b4136 Merge pull request #13781 from AffectedArc07/fixes-timing 
Fixes timings
 2020-07-10 18:42:32 -04:00
AffectedArc07
efc7fa888f Log message change 2020-07-10 20:59:18 +01:00
variableundefined
3782e4875e Merge pull request #13795 from Fox-McCloud/micro-optimization-smoking 
Optimizes Smoking
 2020-07-10 14:28:38 -04: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
37d30a9057 Optimizes Smoking 2020-07-10 03:04:35 -04:00
Fox McCloud
5b09a6a1f0 Merge pull request #13697 from dearmochi/fix-off-center-observer-hud 
Add pAI and Ghost Spawns buttons for ghosts
 2020-07-10 02:34:18 -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
523b4c681b Fixes Cable GC Issues (#13793) 2020-07-09 18:52:37 -06:00