cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,129 Commits 26 Branches 2 Tags
cee64d5c371caf42e9359cb0595e1b7a03416988
Commit Graph

20222 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
41904fff2e Merge pull request #11522 from Couls/mechfab 
Fix cybernetics not appearing in mech fabricator
 2019-06-28 21:03:20 +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
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
Couls
e3a19841d9 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-22 03:54:43 -04:00
Evankhell
caad8f8e5e Portable Seed Extractor 2019-06-21 20:06:06 -04:00
Ty-Omaha
118db59f61 autonote for manual bans finally 2019-06-17 09:07:10 -04:00
Couls
2e09dfbb44 fix typo in rand 2019-06-16 09:14:57 -04:00
Kyep
8b0d4146de TS intent fix 2019-06-14 00:57:48 -07:00
Aurorablade
23666534dc Fixes an oversight in laz injectors 2019-06-14 01:54:07 -04:00
Aurorablade
896450cd42 Adds Hawaiian Shirts 2019-06-13 22:56:24 -04:00
tayyyyyyy
3105895293 Fix players showing as DCed when not 2019-06-10 00:59:47 -07:00
tayyyyyyy
3b24d495a3 Add scrolling messages 2019-06-10 00:26:14 -07:00
Mark van Alphen
fea2b2532d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cultthings 
# Conflicts:
#	paradise.dme
 2019-06-09 23:28:41 +02:00
Improvedname
4db6530728 hide tailo 2019-06-08 17:05:32 +02:00
Mark van Alphen
f7c96702f2 Fix exclamation point 2019-06-07 04:13:53 +02:00
Mark van Alphen
5110112c58 Fix honkbot construction 2019-06-06 18:57:17 +02:00
Mark van Alphen
250ca032c4 Tesla wormhole fix 2019-06-06 17:14:34 +02:00
Mark van Alphen
cbce925372 Fix gutlunches not eating 2019-06-06 06:49:08 +02:00
Mark van Alphen
3381aaf287 Anchor ash flora 2019-06-06 02:16:52 +02:00
Mark van Alphen
cdaeb5d59c Fix ancient goliath tentacles and processing computer on Lavaland 2019-06-05 23:14:39 +02:00
Couls
32bff777e8 in-hand sprites for lantern 2019-06-04 19:38:07 -04:00
Couls
e222a1fc57 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-04 18:33:32 -04:00
Mark van Alphen
efcdb7fb56 Add reagents to goliath_steak 2019-06-04 10:11:12 +02:00
Mark van Alphen
a90b23c271 Re-apply Lava staff fix 2019-06-04 03:46:16 +02:00