cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,219 Commits 26 Branches 2 Tags
fae76166c283f709d940bbd0abbff3710261ab3f
Commit Graph

9433 Commits

Author SHA1 Message Date
variableundefined
96cd20430b Merge pull request #11687 from Kyep/you_have_time 
Public Time & Security
 2019-07-12 18:20:34 +08:00
variableundefined
36736277a1 Merge pull request #11358 from Couls/diagonal-movement 
[Ready for Testmerge] Implement Diagonal Movement
 2019-07-12 17:12:57 +08:00
Couls
147f740c49 Improve diagonal pulling 2019-07-11 14:56:48 -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
variableundefined
8dcccf220a Merge pull request #11125 from Quantum-M/editVampireMuzzle 
Vampire edits
 2019-07-09 18:15:42 +08: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
fb15166fda Merge pull request #11570 from Tayyyyyyy/autocomplete 
Autocomplete input
 2019-07-08 20:21:22 +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
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
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
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
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
B.A.L
78f7d996ce Fixes some issues 2019-06-14 19:55:46 -07:00
Kyep
8b0d4146de TS intent fix 2019-06-14 00:57:48 -07:00
B.A.L
f71d1ef1f0 More work 2019-06-13 18:02:58 -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
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
cbce925372 Fix gutlunches not eating 2019-06-06 06:49:08 +02:00
Mark van Alphen
cdaeb5d59c Fix ancient goliath tentacles and processing computer on Lavaland 2019-06-05 23:14:39 +02:00
Kyep
8db416a2b5 public time, seclevel 2019-06-05 13:08:58 -07:00
Mark van Alphen
6fb65958ed Make Gutlunches and Gubbucks reproduce properly 2019-06-04 00:11:52 +02:00
Mark van Alphen
cd362d6bad Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix 2019-06-03 21:44:01 +02:00
Mark van Alphen
2dd6dcfb55 Remove traces of the Mask of Nar'Sie 2019-06-03 06:33:43 +02:00
Couls
5979166f54 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-02 21:59:58 -04:00
Crazy Lemon
1988ae34d8 Merge pull request #11643 from Markolie/turfs 
Lavaland fixes, continued
 2019-06-02 17:58:56 -07:00
Mark van Alphen
c6e6c6cefd Even better water handling 2019-06-03 00:31:03 +02:00
Crazy Lemon
f2651d43b1 Merge pull request #11421 from Arkatos1/WizardRevenge 
Wizard Update - Revenge of the Federation
 2019-06-02 15:27:42 -07:00
Mark van Alphen
2c7e8ec505 Actually make the ancient goliath able to spawn 2019-06-03 00:27:11 +02:00
Mark van Alphen
fd8a9e4909 Water handling improvement 2019-06-03 00:06:29 +02:00
Mark van Alphen
697bb8eee5 More Lavaland fixes: 
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
 2019-06-02 23:29:50 +02:00
Mark van Alphen
4c40df0895 Goliath code update 2019-06-02 05:03:38 +02:00
Mark van Alphen
81c325262d Fix Ash Walkers mining and antag selection, fix Lavaland Syndicate base incinerator buttons and comms agent mask 2019-06-02 01:18:18 +02:00
datlo
4c95169977 Fix an antag rolling exploit 2019-06-01 23:13:13 +01:00
Mark van Alphen
c9e87f6593 Add more explosive power to Syndicate base, add species specific sprites for explorer equipment (thanks Ionward), fix Drake explosive sound, clarify ash walker/syndicate base personnel flavor text 2019-06-01 21:17:17 +02:00
Arkatos1
a9f040873b Merge https://github.com/ParadiseSS13/Paradise into booicon 2019-05-31 12:59:40 +02:00
Mark van Alphen
2c1ccf6786 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-05-31 05:48:49 +02:00
Crazy Lemon
8502c44df6 Merge pull request #11359 from Kyep/ipintel 
Adds XKeyScore (from TG), forum link, removes old discord link
 2019-05-30 19:57:18 -07:00
Mark van Alphen
b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
 2019-05-30 19:35:52 +02:00
Kyep
3662b90265 fix, 'more info' for admins, better whitelist support, pre-client bans 2019-05-28 11:35:53 -07:00
Arkatos1
47caf4ccbf new boo icon 2019-05-28 18:50:44 +02:00