cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-19 23:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,489 Commits 26 Branches 2 Tags
96840368d40f49d172cb15c39cc9a9cb8c835615
Commit Graph

1256 Commits

Author SHA1 Message Date
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
variableundefined
4de5284557 Merge pull request #9677 from DesolateG/global 
Updates global lists to the global var subsystem.
 2018-10-12 13:18:28 +08:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging 
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
 2018-10-09 10:06:03 +08:00
variableundefined
c2bf480622 Merge pull request #9631 from Birdtalon/ERT-changes 
Gamma ERT Changes
 2018-10-09 08:58:15 +08:00
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
Crazy Lemon
916e0d9a72 Merge pull request #9415 from variableundefined/SpeshulGunlog 
Minor attack log overhaul
 2018-10-08 01:16:21 -07:00
variableundefined
c96eebb767 Merge pull request #9401 from shazbot194/9mm-enforcers 
Updates Enforcers
 2018-10-08 08:12:25 +08:00
Birdtalon
f36b0a4bff changes equip_to_slot_or_del() to equip_or_collect() to prevent item deletion from backpack_contents list 
numerous bugfixes
adds new suit sprites
 2018-10-07 22:32:44 +01:00
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
variableundefined
46b00ac8bc Merge pull request #9461 from Birdtalon/bugs 
Reduces metal return for ammo boxes
 2018-10-07 15:30:37 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05: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
shazbot194
400b237ba2 Oops, fixes foam enforcer icon 2018-08-26 01:58:17 -08:00
shazbot194
e2d7eb0800 Removes a bit more unneeded code 2018-08-26 01:56:27 -08:00
shazbot194
5fa2b58f33 Removes new icons 2018-08-26 01:52:38 -08:00
variableundefined
20698305e0 Minor attack log overhaul 2018-08-25 17:19:01 +08:00
Crazy Lemon
294c3c3ae9 Merge pull request #9284 from variableundefined/KineticAccelerator 
Add in logging for kinetic accelerator
 2018-08-22 22:31:57 -07:00
shazbot194
939cefcca0 Updates Enforcers 2018-08-22 18:48:01 -08:00
shazbot194
9d3c58eee9 Fixes sawing off 2018-08-08 10:24:17 -08:00
Crazy Lemon
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 Lemon
bfb00912af Merge pull request #9113 from shazbot194/Shotguns_mk2 
Shortening Sawn off Shotguns
 2018-08-03 13:43:24 -07:00
Crazy Lemon
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 Lemon
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
tayyyyyyy
8a8f553ab3 Refactor shadowling veil extinguish proc 2018-07-22 19:44:08 -07: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
Kyep
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