cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 10:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,453 Commits 26 Branches 2 Tags
edee2cfceabc4e2ffeac22bffb1d53a4e1efca12
Commit Graph

1113 Commits

Author SHA1 Message Date
Fox McCloud
3dd2c80882 for now 2019-04-29 05:44:17 -04:00
Fox McCloud
7b57d2e319 fixups 2019-04-29 04:41:31 -04:00
Fox McCloud
d0a077f9d5 Powernet Refactor 2019-04-27 02:06:04 -04:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
AffectedArc07
fa6ba7343f Merge branch 'master' into ss-alarms 2019-04-23 20:37:42 +01:00
variableundefined
73f4c6ea99 Merge pull request #11284 from Arkatos1/Null_Charge 
New Shadowling Ability - Null Charge! (replaces Drain Life)
 2019-04-23 21:02:11 +08:00
AffectedArc07
acee1dcb42 SSalarms 2019-04-23 12:45:35 +01:00
Fox McCloud
4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything 
Gives the orphans a home
 2019-04-21 18:44:38 -04:00
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Arkatos1
6a198b9c7f Adds Null Charge ability for the Shadowlings, replacing Drain Life 2019-04-10 23:37:05 +02:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04: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
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
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
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00
Patrick Meade
b4641b7fdb Some path normalization 2019-01-23 08:54:19 -06:00
Aurorablade
4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05:00
void*
8b8cfdaadb Reworked discord interface to replace the IRC one completely 2019-01-06 18:00:28 +01:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Citinited
6354631937 Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted 2018-12-01 00:13:21 +00:00
Certhic
e3f852dff6 magic numbers 2018-11-16 15:32:49 +01:00
variableundefined
b5728a6d74 Merge pull request #10095 from AffectedArc07/crisp-screen-mmmmmm 
Makes status display font crispy
 2018-11-04 12:30:34 +08:00
AffectedArc07
e6296d3505 mmmmmmmmmm crispy 2018-11-02 19:44:23 +00:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
variableundefined
96f5046f19 Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes 
A few fixes
 2018-10-12 13:48:02 +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
Purpose
6c6d35d133 fixies 2018-10-11 22:02:23 +01: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
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Crazy Lemon
ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle 
Port Shuttle to StonedMC
 2018-10-01 01:13:42 -07:00
Purpose
29c0734905 get area master does nothing! 2018-09-30 17:28:47 +01:00
Fox McCloud
6b8b849c27 Merge pull request #9514 from variableundefined/LightFIXture 
Bugfix for card & lightning
 2018-09-27 17:15:38 -04:00
variableundefined
b9adf71445 Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled 
Updates use_power to use the Defines
 2018-09-27 21:47:04 +08:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Purpose
de9b01400a remove light fixtures 2018-09-14 22:00:02 +01:00
variableundefined
d46608590f Fixes things 2018-09-10 22:49:46 +08:00
variableundefined
bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
variableundefined
8302024201 Fixes wire cutting runtime and other potential runtime. 2018-08-29 20:02:42 +08:00
Crazy Lemon
bf8520528c Merge pull request #9257 from variableundefined/WelderCableOverheal 
Adds overheal to welder & cable coil
 2018-08-22 22:15:38 -07:00
Crazylemon64
7b4dd7eb19 Cleans out various macro redefinitions or useless use of syntax 2018-07-30 23:24:35 -07:00
variableundefined
eaf4d642cb Adds overheal to welder & cable coil 2018-07-26 22:22:50 +08:00
tayyyyyyy
95682ffa64 Fix booleans 2018-07-22 23:03:30 -07:00
tayyyyyyy
8a8f553ab3 Refactor shadowling veil extinguish proc 2018-07-22 19:44:08 -07:00