cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,868 Commits 26 Branches 2 Tags
60f0f364039dfa162cf8318cfbc3d1bd2178c90e
Commit Graph

19188 Commits

Author SHA1 Message Date
datlo
60f0f36403 door magic projectile open closets 2019-02-10 19:28:52 +00:00
variableundefined
ffa6ed12f3 Merge pull request #10854 from TDSSS/wizardcrash 
Adds new space ruin, crashed wizard shuttle
 2019-02-10 15:48:33 +08:00
variableundefined
63d2538d66 Merge pull request #10865 from Ty-Omaha/reviver-sleep 
Going to sleep with a reviver no longer heals you
 2019-02-10 08:55:56 +08:00
Ty-Omaha
819042597f reviver sleep 2019-02-09 13:25:38 -05:00
variableundefined
381a9bbc3e Merge pull request #10863 from TDSSS/singulo-fix 
No more pushing singulos
 2019-02-09 22:28:36 +08:00
TDSSS
e70dbe1ad5 No more pushing singulos 2019-02-09 14:57:04 +01:00
AffectedArc07
0c6e1637f0 Fuckin' indents 2019-02-09 10:08:44 +00:00
AffectedArc07
5fa263a7cb Fixes spacing 2019-02-09 09:53:06 +00:00
AffectedArc07
11b2cec57d Allows lesser sanitization 2019-02-09 09:25:50 +00:00
variableundefined
7b5afbadc8 Merge pull request #10838 from Fox-McCloud/defib-nerf 
Reduces Defib Safe Time: Adds Health HUD Defib Indicator
 2019-02-09 13:28:43 +08:00
Gwydion Brain
29a3a25ae6 Merge remote-tracking branch 'ParadiseSS13/master' into flatline_partner_fluff 2019-02-08 19:13:51 -08:00
variableundefined
ce02ed22f6 Merge pull request #10740 from AffectedArc07/discord-link-notify 
Discord linking and roundstart notifications!
 2019-02-09 10:55:20 +08:00
TDSSS
272a29f249 Never spellcast and drive, kids. 2019-02-09 03:00:25 +01:00
Gwydion Brain
6a59bb52a3 Auto stash before rebase of "ParadiseSS13/master" 2019-02-08 16:26:04 -08:00
Fox McCloud
b29fed6bf9 Fox Fluff Item Coat 2019-02-08 17:11:59 -05:00
variableundefined
3aeb1d861c Merge pull request #10831 from Shadeykins/FoodDescriptions 
Tweaks some food descriptions/casing.
 2019-02-08 19:31:34 +08:00
lass9030
03f172eff8 stat, change way drone dies 2019-02-07 20:04:39 +01:00
Fox McCloud
dc09d07d86 Reduces Defib Safe Time: Adds Health HUD Defib Indicator 2019-02-07 00:49:24 -05:00
lass9030
8b666c84c1 fluff suit 2019-02-07 03:52:55 +01:00
Shadeykins
89b9725766 Sorry Citined :( 2019-02-06 18:42:56 -07:00
Shadeykins
1818fd0679 Capital S. 2019-02-05 19:58:40 -07:00
Shadeykins
cda4d7b8d1 Missed some heresy. 2019-02-05 19:57:55 -07:00
Shadeykins
25cf6b60bf donk pocket 2019-02-05 19:57:19 -07:00
Shadeykins
32085e5641 Fixes spaghatt 2019-02-05 19:55:43 -07:00
Shadeykins
e80ea2bbe9 Standardizes casing on drinks. 2019-02-05 19:51:54 -07:00
Shadeykins
a9e7267994 Fixes some casing. 2019-02-05 19:34:35 -07:00
Shadeykins
00f97469ba CS. 2019-02-05 16:32:43 -07:00
Shadeykins
5bda717d37 casing/descriptions 2019-02-05 16:29:41 -07:00
AffectedArc07
265e102c43 Makes ID getting more user friendly 2019-02-05 19:13:34 +00:00
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