Commit Graph

5516 Commits

Author SHA1 Message Date
FreeStylaLT 469dba4067 Minor optimization and comments 2019-08-04 01:02:30 +03:00
FreeStylaLT 2a0a0769b0 spacing and fixes the spam-self-attack exploit with the picker 2019-08-02 18:19:56 +03:00
FreeStylaLT 7153552297 Magic strings to defines, adds a GLOB list for the beacons 2019-08-02 17:40:37 +03:00
FreeStylaLT e0166fa7be and fixes the picker emitting the item / mob destruction messages 2019-08-02 16:12:10 +03:00
FreeStylaLT 0bc40f478e and fixes cancel not working 2019-08-02 16:04:31 +03:00
FreeStylaLT 77ff8394b5 removes a redundant switch 2019-08-02 15:57:44 +03:00
FreeStylaLT de5b2f7d6e adds the actual .dm oops 2019-08-02 14:43:26 +03:00
FreeStylaLT c190c814ad adds the enginepicker 2019-08-02 14:36:31 +03:00
joep van der velden 47a63e3a51 Added a few tips and fixed a bug 2019-07-29 01:42:51 +02:00
Ty-Omaha f5134a417d door remote logs 2019-07-28 17:49:04 -04:00
Mark van Alphen 8c8950bf07 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
2019-07-15 20:37:44 +02:00
Mark van Alphen 88fa0d27df Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
# Conflicts:
#	paradise.dme
2019-07-15 20:30:54 +02:00
Mark van Alphen fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
tayyyyyyy 57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
Arkatos1 47b447619a Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-07-12 19:40:59 +02:00
Couls bf161edfeb grammar 2019-07-11 19:36:25 -04:00
Kyep fd389810f2 medals in lockers 2019-07-10 20:13:14 -07:00
Couls a8a9e8e022 Baseball! 2019-07-10 21:12:35 -04:00
variableundefined e42e1af87a Merge pull request #11634 from Markolie/laborstacker
Updates the prison labor point system
2019-07-09 18:21:58 +08:00
Mark van Alphen d03f4dcafb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
# Conflicts:
#	paradise.dme
2019-07-08 19:36:30 +02: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
unknown 8aa5bbdb9c removed unnecessary == TRUE 2019-07-06 14:26:42 -04:00
unknown ded7e4be67 fixed a bug where construction permits deleted themselves prematurely 2019-06-30 20:49:37 -04:00
Arkatos1 de9da04572 Standardized colors, finished change wrapper choosing and modified templates and their sizes 2019-06-30 19:46:13 +02:00
Arkatos1 16a81d2527 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-06-30 16:09:38 +02:00
Arkatos1 d33d018e62 Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster 2019-06-30 16:08:33 +02:00
AzuleUtama ab8c0f5aa5 Reverted compact rifle changes, false bottomed case now starts empty 2019-06-30 12:28:23 +01:00
AzuleUtama fa2ca7c87c Ports VG false bottomed briefcase + compact sniper changes 2019-06-29 15:47:26 +01:00
AzuleUtama dbed990412 Revert "Ports false-bottomed briefcase from VG"
This reverts commit 3c5cf391b3.
2019-06-29 15:10:41 +01:00
AzuleUtama 62af5597d3 Merge remote-tracking branch 'upstream/master' 2019-06-29 15:10:27 +01:00
AzuleUtama 3c5cf391b3 Ports false-bottomed briefcase from VG 2019-06-27 08:53:08 +01:00
AzuleUtama 9500df95d3 Traitor thermals and security HUD now use chameleon code 2019-06-22 14:06:07 +01:00
Improvedname 24c2b0fd4f j 2019-06-10 19:53:03 +02:00
Mark van Alphen e0a21759fb Add tribal splints 2019-06-07 04:06:12 +02:00
Mark van Alphen bc12891f02 Move shuttle seat out of comfy chairs category 2019-06-07 03:59:45 +02:00
Mark van Alphen f56854292a Add shuttle chairs (and fix newlines on all maps) 2019-06-07 03:39:24 +02:00
Mark van Alphen ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Crazy Lemon 1988ae34d8 Merge pull request #11643 from Markolie/turfs
Lavaland fixes, continued
2019-06-02 17:58:56 -07:00
Crazy Lemon d94906e19a Merge pull request #11656 from Markolie/multiplier
Fixes an exploit with the sheet multiplier
2019-06-02 15:52:37 -07:00
Mark van Alphen c6e6c6cefd Even better water handling 2019-06-03 00:31:03 +02:00
Mark van Alphen 8a70f6aa65 Sheet multiplier exploit fix 2019-06-03 00:16:39 +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 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
Mark van Alphen 4446664997 Update labor stacker 2019-05-31 19:37:25 +02: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
joep van der velden f07bd98a2a Blindfolds are now craftable from 3 cloth 2019-05-28 19:43:01 +02:00
variableundefined 3acf995a76 Merge pull request #11466 from Markolie/bundles
Species chameleon fix
2019-05-28 10:53:17 +08:00
Mark van Alphen 080232f843 Fix grenade double admin message 2019-05-28 00:01:22 +02:00