cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,134 Commits 26 Branches 2 Tags
2d7f2bb3c2d0c9a46597aa208ae4eda6ea892cfb
Commit Graph

32691 Commits

Author SHA1 Message Date
Couls
2d7f2bb3c2 Code cleanup, spacing fixes 2019-07-09 08:11:43 -04:00
Couls
e16b495170 More testmerge fixes and improvements 
Shift middle click locks your direction again
Spacepods now move again(literally one letter fixed this)
Holster hotkey is back!(H to holster and unholster)
Hotkey Toggle button has been removed from the bottom bar and verbs
 2019-07-09 07:59:12 -04:00
Couls
510181dc10 Update preferences.dm 2019-07-09 02:43:46 -04:00
Couls
6c8fc34cae bitflag hotfix 2019-07-09 02:40:02 -04:00
Couls
4a832c4f61 Fix testmerge issues 2019-07-08 11:20:25 -04:00
Couls
cee64d5c37 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-08 10:13:15 -04:00
variableundefined
c1960f9fcf Merge pull request #11731 from Couls/patch-2 
fix typo in msg reagent
 2019-07-08 20:26:38 +08:00
variableundefined
756e48388a Merge pull request #11683 from Couls/lantern 
in-hand sprites for lantern
 2019-07-08 20:25:49 +08:00
variableundefined
49059b5317 Merge pull request #11619 from Tayyyyyyy/scrolling_messages 
Add scrolling to messages window, bug fix
 2019-07-08 20:23:37 +08:00
variableundefined
49eb143c4e Merge pull request #11613 from Arkatos1/smartfridge_ascension 
Smartfridge gets smarter Mk.3
 2019-07-08 20:23:11 +08:00
variableundefined
58a5ec105a Merge pull request #11608 from Markolie/ghostpda 
Re-adds ghost PDA messages
 2019-07-08 20:22:42 +08:00
variableundefined
3fdf53b180 Merge pull request #11593 from AzuleUtama/CyberBundleFix 
Makes Cybernetic Bundles a Nukie-only item again
 2019-07-08 20:21:47 +08:00
variableundefined
fb15166fda Merge pull request #11570 from Tayyyyyyy/autocomplete 
Autocomplete input
 2019-07-08 20:21:22 +08:00
variableundefined
d84d2a0b55 Merge pull request #11562 from Tayyyyyyy/markdown 
Support markdown in papers
 2019-07-08 20:20:46 +08:00
variableundefined
742bc62c8b Merge pull request #11544 from Arkatos1/recharger 
Rechargers now show their contents and charge status on examine
 2019-07-08 20:18:36 +08:00
variableundefined
82a52969e2 Merge pull request #11525 from Citinited/rpd-radial-menu 
Adds a mini-radial menu to the RPD
 2019-07-08 17:33:46 +08:00
variableundefined
ac011e37d7 Merge pull request #11519 from Arkatos1/doll 
Clicking on a health doll icon will now check you for injuries
 2019-07-08 17:32:50 +08:00
Couls
a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
variableundefined
fe6ba72462 Merge pull request #11706 from improvedname/explorersuit 
Explorer suits now will properly hide tails
 2019-07-07 22:10:35 +08:00
variableundefined
93d9cd4e08 Merge pull request #11787 from JKnutson101/lattice_catwalk_fix 
Fixed a bug that prevented Catwalks and Lattice from returning materials
 2019-07-07 22:10:08 +08:00
variableundefined
df199a651d Merge pull request #11663 from Markolie/maskofnarsie 
Remove traces of the Mask of Nar'Sie
 2019-07-07 22:10:02 +08:00
variableundefined
c2bd18e4fd Merge pull request #11639 from datlo/antagexploitfix 
Fix an antag rolling exploit
 2019-07-07 20:27:59 +08:00
variableundefined
f0f7ff63fc Merge pull request #11771 from JKnutson101/permitBranch 
Fixed a bug where construction permits deleted themselves prematurely
 2019-07-07 17:33:29 +08:00
unknown
8aa5bbdb9c removed unnecessary == TRUE 2019-07-06 14:26:42 -04:00
variableundefined
a4e54cc310 Merge pull request #11770 from Citinited/bloody-hellfire 
Fixes some bloody bugs in the bloody writing system
 2019-07-06 17:51:13 +08:00
unknown
25f68f2e41 Removed a line that prevented Catwalks and Lattice from returning materials 2019-07-04 16:17:32 -04:00
Kyep
ac5ab6b3db fixes bug with biogenerator 2019-07-04 12:41:39 -07:00
Couls
33d35eb625 Merge branch 'master' into diagonal-movement 2019-07-02 05:55:44 -04:00
Couls
411a6ecec7 some more tweaks 2019-07-01 03:04:24 -04:00
unknown
ded7e4be67 fixed a bug where construction permits deleted themselves prematurely 2019-06-30 20:49:37 -04:00
Citinited
96a565a773 Dead or incapacitated mobs may no longer write anything in blood; write in blood bugfix 2019-06-30 21:42:51 +01:00
variableundefined
a189efe72d Merge pull request #11449 from Shadeykins/AI-Laws 
Changes Quarantine, NT Default, Aggressive, and Corporate AI Lawsets [REVIEW READY].
 2019-06-30 15:15:07 +08:00
variableundefined
7ffce9acdf Merge pull request #11504 from Crazylemon64/sdql_verb_interface_remove 
Removes the verb interface to SDQL2
 2019-06-30 14:36:04 +08:00
variableundefined
497601245f Merge pull request #11496 from Markolie/cultthings 
Gives the night vision spell to cult constructs
 2019-06-30 14:35:32 +08:00
variableundefined
7dad0f001b Merge pull request #11733 from Ty-Omaha/this-has-psised-me-off-long-enough 
Adds Auto-Note for Manual Bans
 2019-06-29 09:23:59 +08:00
variableundefined
12b20b594d Merge pull request #11738 from evankhellparadise/portableseed 
Portable Seed Extractor design
 2019-06-29 09:23:22 +08:00
variableundefined
facb2b344c Merge pull request #11748 from Ty-Omaha/fix 
Fixes Shield Blob Exploit
 2019-06-29 09:23:05 +08:00
variableundefined
8c87fbb557 Merge pull request #11681 from Couls/keyphrase-fix 
Fixes empty words in syndicate keyphrases
 2019-06-28 21:40:47 +08:00
variableundefined
baa8fea378 Merge pull request #11591 from Citinited/fuck-you-disposals 
Fixes bug that deletes stuff in blocked trunks
 2019-06-28 21:04:24 +08:00
variableundefined
87f483c9f6 Merge pull request #11581 from alex-gh/location_hint_fix 
Steal objective and Adv Pinpointer no longer target items in Centcom Z level.
 2019-06-28 21:04:01 +08:00
variableundefined
41904fff2e Merge pull request #11522 from Couls/mechfab 
Fix cybernetics not appearing in mech fabricator
 2019-06-28 21:03:20 +08:00
variableundefined
6f4ef0084d Merge pull request #11715 from improvedname/hop-my-AAA-AAA-AA 
Miner starter kits you can order from cargo will no longer include a ID that grants miner/cargo access, only the concription kits from mining vendor
 2019-06-28 21:02:23 +08:00
variableundefined
7d8dfeb3d3 Merge pull request #11722 from Aurorablade/JustInTimeForsummer 
Adds Hawaiian Shirts
 2019-06-28 21:01:42 +08:00
variableundefined
b8f255e899 Merge pull request #11724 from Kyep/no_more_deadly_nuzzling 
Terror Spider Intent Fix
 2019-06-28 21:00:54 +08:00
variableundefined
7a04116a07 Merge pull request #11728 from Citinited/ai-slippers 
Better sprites for liquid dispensers
 2019-06-28 20:59:37 +08:00
Ty-Omaha
bc857784e8 Spelling 2019-06-24 10:31:32 -04:00
variableundefined
3bedd8c5b6 Merge pull request #11610 from Arkatos1/booicon 
New Boo! spell icon
 2019-06-24 20:52:44 +08:00
variableundefined
e01efbeb01 Merge pull request #11586 from iantine/Warble 
Adds 'warble' emote for Skrell
 2019-06-24 18:31:50 +08:00
variableundefined
97ee2185d2 Merge pull request #11447 from Kyep/door_fix 
Fixes runtime when disarming/grabbing some doors (can_admin_interact())
 2019-06-24 18:31:24 +08:00
Ty-Omaha
8d7fcc272c Exploit fix 2 2019-06-24 02:26:13 -04:00