cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-19 01:57:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
666 Commits
Author SHA1 Message Date
variableundefinedandGitHub 55119941b8 Merge pull request #9380 from Kyep/WW_hijack 
Removes hijack reward from Wild West gateway mission
 2018-09-28 11:08:14 +08:00
Purpose 037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Fox McCloudandGitHub fb80e1a66d Merge pull request #9443 from alex-gh/gateway_fix 
Gateway now also checks for exile implants in buckled mobs.
 2018-09-09 17:59:16 -04:00
Crazy LemonandGitHub 61a39a71b0 Merge pull request #9255 from variableundefined/EconomyRefactor 
Economy Refactor & Changes - Part 1
 2018-09-04 17:14:25 -07:00
Crazy LemonandGitHub 599c58fb53 Merge pull request #9369 from variableundefined/Analyzer 
Analyser > Analyzer
 2018-09-04 09:04:14 -07:00
Kyep 2c0a779b62 Fixes area/shutter error 2018-09-01 19:05:42 -07:00
alex-gh 6aea12a2fb Updated controll statements to have returns on their own lines. 2018-08-29 10:22:38 +02:00
alex-gh 8c06820e1f Gateway now also checks for exile implants in buckled mobs. 2018-08-29 09:02:52 +02:00
Kyep 24b20cf7f8 removes hijack reward from WW 2018-08-18 11:26:38 -07:00
variableundefined 6b28d2f267 Remove swapmaps 2018-08-17 19:08:32 +08:00
variableundefined d2cf3353a8 Analyser > Analyzer 2018-08-16 21:01:13 +08:00
Crazylemon64 af64e7a8ed Space ruins no longer can fill the border of the level 2018-08-04 14:39:47 -07:00
variableundefined 3b38d937b0 Economy refactors 2018-07-26 19:35:27 +08:00
Crazylemon64 b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
Fox McCloud 6092e0319f name and further fixes 2018-07-19 02:04:03 -04: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
Kyep de0ceaf769 Deletes chatrooms 2018-06-20 18:24:59 -07:00
tigercat2000 5ace5944d9 Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings 2018-05-31 19:34:47 -07:00
tigercat2000 7fb8f8d76c Merge remote-tracking branch 'upstream/master' into more_ss_ports 
# Conflicts:
#	paradise.dme
 2018-04-30 09:27:11 -07:00
tigercat2000 7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs 
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
 2018-04-28 17:55:15 -07:00
Fox McCloud cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04: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
tigercat2000andGitHub 86f89382c4 Merge pull request #8834 from Crazylemon64/hotelsec_lootnerf 
Nerfs loot-pinata-ing of hotel guards
 2018-04-06 20:07:30 -07:00
Crazylemon64 002684fa5d Hotel space guards now fight back more meaningfully 
and now dust on death to prevent loot pinata-ing
 2018-04-01 22:26:32 -07:00
Fox McCloud 22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
tigercat2000 dca16e60cf PS -> SMC Ports: LINDA, Spacedrift, Throwing 
This commit ports LINDA, spacedrifting, and throwing to the SMC.
 2018-03-02 23:58:57 -08:00
Crazy LemonandGitHub 12fed20743 Merge pull request #8411 from Kyep/wild_west_fix 
Wild west tweaks
 2018-01-04 15:45:21 -08:00
tigercat2000andGitHub 48d78b4648 Merge pull request #7832 from Fox-McCloud/lungsss 
Breathing is Now Handled on Lungs
 2017-12-01 17:51:19 -08:00
Kyep 5a128e3955 No bluffing. 2017-11-30 19:02:31 -08:00
Kyep 59d9f26687 v1 2017-11-30 18:52:23 -08:00
uraniummeltdown 7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
Fox-McCloud 9d14e6c9da Merge remote-tracking branch 'upstream/master' into lungsss 
# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm
 2017-08-05 19:03:52 -04:00
Fox-McCloud 027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00
Fox-McCloud 77375fc1c4 Breathing is Now Handled on Lungs 2017-07-19 03:28:21 -04:00
Kyep 782edee8a7 Makes reserach notes part of awaymission DM file 2017-07-10 03:16:56 -07:00
Markolie d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace 
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
 2017-04-14 18:15:12 +02:00
Fox-McCloud 5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Fox McCloudandGitHub 2621461571 Merge pull request #6531 from Kyep/gateway_blackmarketpackers 
Tweaks Black Market Packers Away Mission
 2017-04-01 23:05:01 -04:00
Mark van AlphenandGitHub 2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Crazylemon64 babe5eb074 Away missions load cables, pipes, and templates OK now 2017-03-27 00:37:24 -07:00
Kyep 3189f463b1 Splits powernet fix into new PR 2017-03-26 16:17:07 -07:00
Fox McCloudandGitHub 031fcf3b0e Merge pull request #6533 from Kyep/gateway_centcomaway 
Tweaks Centcom away mission to make it viable
 2017-03-26 18:23:21 -04:00
Mark van AlphenandGitHub cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
Jovan 7898583968 Change Door Sounds 2017-03-13 06:25:19 -04:00
Mark van AlphenandGitHub b26d50d9f9 Merge branch 'master' into findnreplace 2017-03-08 10:37:10 +01:00
Kyep 4524e4e575 Adds powergrid 2017-03-08 01:11:40 -08:00