cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 13:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,792 Commits 26 Branches 2 Tags
d61fa732f3fac77f7f2cb74db4e4d9f53f16870e
Commit Graph

19158 Commits

Author SHA1 Message Date
variableundefined
3435408a1f Merge pull request #10826 from lass9030/sorium-ldm_move-resist_check 
Makes vortex chems check for moveresist
 2019-02-05 10:18:33 +08:00
variableundefined
5021d5cb27 Merge pull request #10824 from Kyep/slime_emoting 
fixes slime emote runtime
 2019-02-05 10:18:23 +08:00
lass9030
ce06589c2a checks for moveresist 2019-02-04 22:26:05 +01:00
Kyep
e1fb83f6b6 fixes slime emote runtime 2019-02-04 07:52:26 -08:00
variableundefined
ecd8f80af4 Merge pull request #10820 from MINIMAN10000/fuel-bomb-fix 
Boom function now checks for fuel before fuel tank boom.
 2019-02-03 17:22:16 +08:00
MINIMAN10000
516b7e0144 Boom function now checks for fuel before fuel tank boom. 2019-02-03 00:53:46 -08:00
variableundefined
e7d729b074 Merge pull request #10817 from taukausanake/pai_light 
Pai light
 2019-02-03 14:26:46 +08:00
variableundefined
efa598cfd0 Merge pull request #10800 from Fox-McCloud/no-breathe-no-talk 
Lack of Breath Incurs Silence
 2019-02-03 13:25:06 +08:00
taukausanake
f3c44848e2 Applies latest requests 
I _think_ these resolve what was left in the last PR. Been a while since
I last did this

 Changes to be committed:
	modified:   code/modules/mob/living/silicon/pai/software_modules.dm
 2019-02-02 23:16:30 -06:00
taukausanake
b7ce683ab1 Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light 
Conflicts:
	code/game/gamemodes/shadowling/shadowling_abilities.dm
	code/game/objects/items/devices/flashlight.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm

 Changes to be committed:
	modified:   code/game/gamemodes/shadowling/shadowling_abilities.dm
	modified:   code/game/machinery/computer/computer.dm
	modified:   code/game/machinery/floodlight.dm
	modified:   code/game/objects/items/devices/flashlight.dm
	modified:   code/game/objects/items/devices/paicard.dm
	modified:   code/modules/clothing/head/hardhat.dm
	modified:   code/modules/clothing/spacesuits/hardsuit.dm
	modified:   code/modules/clothing/spacesuits/plasmamen.dm
	modified:   code/modules/lighting/lighting_atom.dm
	modified:   code/modules/mob/living/carbon/human/human.dm
	modified:   code/modules/mob/living/living.dm
	modified:   code/modules/mob/living/silicon/pai/pai.dm
	modified:   code/modules/mob/living/silicon/pai/software_modules.dm
	modified:   code/modules/mob/living/silicon/robot/robot.dm
	modified:   code/modules/pda/PDA.dm
	modified:   code/modules/power/lighting.dm
	modified:   code/modules/projectiles/gun.dm
 2019-02-02 22:53:46 -06:00
variableundefined
b1c1e71f23 Merge pull request #10813 from Fox-McCloud/skittles-fluff 
Skittles Fluff Item--Kiachi
 2019-02-03 10:13:32 +08:00
Fox McCloud
5fce6edc0d Skittles Fluff Item--Kiachi 2019-02-02 18:52:43 -05:00
variableundefined
58e3c95c81 Merge pull request #10778 from MINIMAN10000/helpful-push 
Mobs on help intent no longer push structures or mobs that are pulling structures
 2019-02-02 21:05:00 +08:00
variableundefined
47d81908fd Merge pull request #10798 from TDSSS/second-mob-spawner-fix 
Fixed mob spawner menu, this time for real
 2019-02-02 21:03:23 +08:00
variableundefined
30f7f623de Merge pull request #10802 from Kyep/playtime_panel_redux 
Updates player playtime report
 2019-02-02 20:54:00 +08:00
TDSSS
08e5b5d484 fixed spacing 2019-02-02 13:52:25 +01:00
alex-gh
7c57d652e1 Fixed non-breating mobs adding to germ_level in surgery. 2019-02-02 13:40:05 +01:00
Kyep
00187ad971 Updates show player playtime report 2019-02-01 23:46:29 -08:00
Fox McCloud
b02ffcd6a8 Lack of Breath Incurs Silence 2019-02-02 00:15:52 -05:00
TDSSS
990b05b4ef Fixed mob spawner menu, this time for real 2019-02-02 05:08:02 +01:00
Fox McCloud
f9aa125eb5 Merge pull request #10796 from Citinited/sexy-clowns-oh-god 
Repaths sexy clown stuff to be subtypes of the existing clown items
 2019-02-01 17:48:18 -05:00
Citinited
41ac5e0027 Repath of sexy clown gear: part 1 2019-02-01 21:46:58 +00:00
variableundefined
8e0f0761ea Merge pull request #10785 from AffectedArc07/changelog-button-fix 
Darkmode fixes
 2019-02-01 10:41:21 +08:00
variableundefined
d382fa1c7c Merge pull request #10761 from datlo/agentidfixes 
Refactors agent ID phototaking, misc ID fixes/improvements
 2019-02-01 10:17:08 +08:00
Ty-Omaha
913c2061c0 dont_save 2019-01-31 12:10:28 -05:00
datlo
1b08c7a43c Unbreaks wingdings 
Jestosterone PR accidentally removed the check for wingdings mutation.
this re-adds it.
 2019-01-31 14:26:09 +00:00
variableundefined
d26a08e373 Merge pull request #10768 from datlo/itspaydayfellas 
Updates syndi kits, add armored suit jacket
 2019-01-31 11:30:27 +08:00
variableundefined
e19b61662f Merge pull request #10736 from datlo/ghettosurgeryfix 
Refactor surgery early cautery, add cyborg medical grip, misc surgery fix/changes
 2019-01-31 11:29:09 +08:00
variableundefined
dfdd9ce8a0 Merge pull request #9705 from Kyep/ts_move_speed_fix 
Terror spider speed settings now respected when under player control
 2019-01-31 11:26:37 +08:00
variableundefined
2cff4b35c5 Merge pull request #10777 from Kyep/admin_room_fix 
Fixes blast door buttons, refactors buttons to remove range var
 2019-01-31 11:04:45 +08:00
variableundefined
21cc9d882f Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE 
I JUST CONFLICTED EVERYTHING
 2019-01-31 11:03:33 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
Aurorablade
afc6ad524f DMI File Casing Rename 2019-01-30 20:09:39 -05:00
AffectedArc07
2d4dfb55b7 Darkmode fixes 2019-01-30 17:34:12 +00:00
MINIMAN10000
80322feeb5 mobs on helpful intent no longer push pulled structures or players pulling structures, structure.dm follows mob.dm's issilicon for isstructure as per contributing no hacky code, pulledby now set to null when stop_pulling() is called, thus they actually stop pulling 2019-01-29 21:09:53 -08:00
Kyep
a23c55a541 Eliminates 'range' var from door_controls, uses tags/zlevel instead 2019-01-29 18:13:23 -08:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
AffectedArc07
e7405fcd3f Merge branch 'master' into darkmode-sql 2019-01-29 16:31:57 +00:00
variableundefined
9f34d70034 Merge pull request #10772 from Kyep/hellhound_fix 
Hellhound AOE fix, hound description update
 2019-01-29 16:35:37 +08:00
variableundefined
8f61180541 Merge pull request #10767 from farie82/virology-hotfix 
Fixes the virus referencing bug
 2019-01-29 16:32:24 +08:00
Kyep
94b76aead9 AOE fix, desc update 2019-01-28 22:51:51 -08:00
variableundefined
5f7eacf4ad Merge pull request #10756 from datlo/abductorbrain 
Changes abductor brains to use the alien brain sprite
 2019-01-29 11:09:33 +08:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00
lass9030
e4eedaf975 correct meat type for cake cat 2019-01-29 00:45:01 +01:00
datlo
a2ee8a0d7e Updates syndi kits, add armored suit jacket 
- Adds two suit jackets to the arrivals locker vendor
- Adds the armored suit jacket to armors. Same defense as standard
security armor.
- Adds the executive suit and armored jacket to Bond, Payday, and
Professional syndi kits
- Replaces the X4 in Payday by a C4
- Reskins the thermal glasses in Professional to look like sunglasses.
Does not provide flash protection.
- Replaces the toolbox in professional by a pair of combat gloves.
 2019-01-28 18:37:58 +00:00
joep van der velden
53396bea95 Fixes the virology problem 2019-01-28 18:02:20 +01:00
variableundefined
1a0737bf59 Merge pull request #10751 from Diegoflores31/patch-2 
Update Crossbow.Dm
 2019-01-28 17:13:25 +08:00
variableundefined
c0f640f3e5 Merge pull request #10763 from Ionward/ionwardfluff 
Ionward Fluff Labcoat
 2019-01-28 13:06:54 +08:00
Ionward
14d23a7eb2 ionward_fluff_labcoat 2019-01-27 19:09:04 -08:00
variableundefined
70ddb65f29 Merge pull request #9287 from Citinited/funny-chemicals 
Adds a new clown chemical 🤡
 2019-01-28 06:11:38 +08:00