cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 10:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,299 Commits 26 Branches 2 Tags
8955dc7db6b04c19de41fbb8637fd2a50b2a224f
Commit Graph

35027 Commits

Author SHA1 Message Date
joep van der velden
8955dc7db6 Actual fix. Did a wrong analysis 2020-07-17 21:31:55 +02:00
joep van der velden
aa8d9cf26c Fixes a kitchen spike runtime 2020-07-17 21:16:47 +02:00
Fox McCloud
5e7d484af6 Merge pull request #13827 from Autumn211/department_loadout_hats 
Makes job gear have no overlap cost in loadout
 2020-07-17 14:29:32 -04:00
Fox McCloud
41f7993781 Merge pull request #13853 from AffectedArc07/only-one-theta-station 
Makes it so only one theta station can spawn
 2020-07-17 14:27:11 -04:00
Fox McCloud
823eb0972c Merge pull request #13864 from TDSSS/shuttle-fix 
Fixes admin ghost ert shuttle issue
 2020-07-17 14:16:27 -04:00
TDSSS
0031d03e93 Fixes runtime 2020-07-17 14:48:20 +02:00
AffectedArc07
82c2cb0c4c Allows players to pick body accessories again 2020-07-17 07:57:45 +01:00
AffectedArc07
b3102cd514 Makes it so only one theta station can spawn 2020-07-16 09:49:00 +01:00
Fox McCloud
95d3d4a46c Merge pull request #13852 from Oyu-De/test-fix-one, 
Spelling mistake correction
 2020-07-15 19:24:56 -04:00
Oyu-De
d634ac5e1a Spelling mistake correction 2020-07-15 22:14:50 +03:00
Autumn211
2c1cd44795 Makes various job-specific gear not overlap cost 2020-07-15 20:07:43 +01:00
AffectedArc07
b511d55cd4 Gamebreaking bug fix immediately 2020-07-15 20:04:08 +01:00
AffectedArc07
2555c365c3 Removes duplicate helper 2020-07-15 15:55:19 +01:00
SteelSlayer
e08cceb096 painter fix 2020-07-14 11:23:28 -05: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
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