cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 02:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,698 Commits 17 Branches 2 Tags
074ee967e55c86c2d814368bdec3a422cfb32b01
Commit Graph
1039 Commits
Author SHA1 Message Date
Birdtalon 074ee967e5 Merge branch 'master' into ERT-changes 2018-10-07 19:22:10 +01:00
Purpose 05a472756b cheaters 2018-10-07 10:38:07 +01:00
variableundefinedandGitHub 46b00ac8bc Merge pull request #9461 from Birdtalon/bugs 
Reduces metal return for ammo boxes
 2018-10-07 15:30:37 +08:00
Birdtalon 04ebe67db7 materials now scale to contents 2018-10-01 22:38:11 +01:00
Birdtalon 1628467857 Merge branch 'master' into ERT-changes 
# Conflicts:
#	icons/mob/head.dmi
 2018-09-30 14:53:32 +01:00
Birdtalon c72561d194 addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines 2018-09-29 20:29:26 +01:00
Purpose 6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
Birdtalon deec79982e adds paranormal loadouts, alters ERT survival kit box, updates PDW 9 sprite, adds paranormal armour variants. 2018-09-28 19:22:55 +01:00
Velden,J. van der (Joep) 7193bb4c60 Fixes the point blank shooting not working on tiles with multiple people 2018-09-28 12:51:28 +02:00
Birdtalon 55fa8bb5bd tidying up 2018-09-22 15:53:37 +01:00
Birdtalon d6dc26cf22 adds ERT sidearm "PDW-9" 2018-09-20 21:45:46 +01:00
Birdtalon 8ed6cd380c adds extra icon overlay 2018-09-03 18:11:20 +01:00
Birdtalon 5275b5f56f further gun tweaks/changes, adds sprite 2018-08-31 19:12:39 +01:00
Birdtalon 3d0f24a1ae reduces metal return for ammo boxes 2018-08-30 18:54:45 +01:00
Birdtalon 49e47d00bb adds multi lens immolation gun 2018-08-29 18:57:35 +01:00
Crazy LemonandGitHub 294c3c3ae9 Merge pull request #9284 from variableundefined/KineticAccelerator 
Add in logging for kinetic accelerator
 2018-08-22 22:31:57 -07:00
shazbot194 9d3c58eee9 Fixes sawing off 2018-08-08 10:24:17 -08:00
Crazy LemonandGitHub 6a925fb205 Merge pull request #8515 from Kyep/depot 
Reworks Syndicate Supply Depot
 2018-08-07 09:34:02 -07:00
Kyep 1f65c9a734 CrazyLemon 1, all the minor issues 2018-08-06 21:08:01 -07:00
Crazy LemonandGitHub bfb00912af Merge pull request #9113 from shazbot194/Shotguns_mk2 
Shortening Sawn off Shotguns
 2018-08-03 13:43:24 -07:00
Crazy LemonandGitHub 1452f82eaf Merge pull request #9265 from Fox-McCloud/species-refactor-follow-up 
Species Refactor Followup
 2018-08-02 17:08:57 -07:00
Fox McCloud 7f2030415f staff of change fix 2018-08-02 13:43:44 -04:00
Crazy LemonandGitHub 64058328d9 Merge pull request #9281 from CornMyCob/desc-fixes 
Small grammar fixes
 2018-07-31 17:01:24 -07:00
variableundefined a0dacfb6be Fix runtime 2018-07-31 20:42:06 +08:00
variableundefined 617d39a9e5 Add in logging for kinetic accelerator 2018-07-31 20:00:02 +08:00
CornMyCob b08ebd0cbe Small grammar fixes 2018-07-30 22:45:56 +01:00
Fox McCloud 7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
shazbot194 b82393790e Code Improvements 2018-07-12 16:40:21 -08:00
Fox McCloud 6c9f83f685 Stechkin Maintenance Pistol Change 2018-06-30 19:24:56 -04:00
shazbot194 6b8da9ca13 Adds in all the stuff from the last one 2018-06-13 20:22:17 -08:00
Kyepandtigercat2000 412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992) 
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
 2018-06-13 16:55:21 -07:00
Tayyyyyyy 919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy 42f85919de More their 2018-05-25 18:34:26 -07:00
tigercat2000andGitHub 858d83505b Merge pull request #9067 from Birdtalon/lasertag 
Laser tag projectiles make tap sound when striking
 2018-05-25 18:03:06 -07:00
Birdtalon d46d84237f laser tag guns now make tap.ogg when striking 2018-05-23 21:43:34 +01:00
Ansari 827503b0a4 EMP now provide coordinates and allow you to jump to it. Most EMP instance except for the Experimentor and the Singularity are now logged. 2018-05-23 18:33:12 +08:00
Fox McCloud c5cbb0414a Fixes Basilisk Projectiles 2018-05-14 19:27:43 -04:00
tigercat2000andGitHub 662d7f34e2 Merge pull request #8949 from Kyep/tsf_marines 
Solar Federation Outfit Fixes/Tweaks
 2018-05-04 12:50:38 -07:00
Fox McCloud c73a6b237d logging 2018-04-29 21:03:31 -04:00
Kyep da2122626a TSF marine update 2018-04-29 01:45:13 -07:00
Fox McCloud 3dd1a8861d Ports TG's Blastcannon 2018-04-27 07:22:55 -04:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud eafd57487c Merge remote-tracking branch 'upstream/master' into component-port 
# Conflicts:
#	paradise.dme
 2018-04-23 13:54:50 -04:00
Fox McCloud 0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
tigercat2000 2364b0332b Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps 2018-04-19 15:08:59 -08:00
tigercat2000 c03621c508 Completely Overhaul Logging 
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
 2018-04-19 15:07:59 -08:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
shazbot194 adcf2dcada Merge fix 2018-04-01 19:17:48 -08:00