cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,791 Commits 26 Branches 2 Tags
4ca61d45decd604c6498d44c52df1b95d3adb771
Commit Graph

533 Commits

Author SHA1 Message Date
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Kyep
a39a0df1f9 limit traders spawned to 2 2019-01-12 15:22:29 -08:00
Kyep
3cfce8eca5 trader event static weight 180, based on convo with neca 2019-01-10 19:42:30 -08:00
Kyep
f77e85810e enable event, but make it fail with msg on red+ alert 2019-01-10 17:43:56 -08:00
Kyep
787aee9655 replace trade objectives with 15 plasma bars & 10,000c 2019-01-10 15:16:59 -08:00
Kyep
7795098ea2 runtime fix 2019-01-03 15:23:48 -08:00
Kyep
d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
Aurorablade
ef0171c480 Fixes Tears and Demons 2018-12-31 00:58:25 -05:00
Aurorablade
9ade8eb04a Typo... 2018-12-17 23:05:12 -05:00
Aurorablade
daf04fa8de honkening 2018-12-17 22:41:14 -05:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Kyep
702f4db165 outfit, vehicles, paperfix, viruses 2018-12-12 00:31:56 -08:00
Aurorablade
8412befde2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello 2018-10-23 18:17:32 -04:00
Mark Mak
91dcf447ec Merge pull request #9888 from Fox-McCloud/spark-refactor 
Refactors Spark Spread Activation
 2018-10-19 08:41:03 +08:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
Squirgenheimer
b50ec79f49 fixes runtime in sentience.dm 2018-10-09 00:07:51 -04:00
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
Purpose
ea74920535 no no no no cyberiaaaaad 2018-10-05 20:57:41 +01:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Kyep
fd2cb10975 Blob fixes, including fixes #9365 2018-09-04 19:44:14 -07:00
Crazy Lemon
61a39a71b0 Merge pull request #9255 from variableundefined/EconomyRefactor 
Economy Refactor & Changes - Part 1
 2018-09-04 17:14:25 -07:00
Crazy Lemon
b52da17809 Merge pull request #9260 from Kyep/blob_mouse 
MouseBlobs
 2018-09-04 09:26:23 -07:00
Mars
f2532e74ba Merge conflict fix 2018-08-28 11:28:13 +02:00
Mars
b5b09b435c No hard-coded format in the macros anymore 2018-08-16 11:51:52 +02:00
Mars
e8d92b3ced More flexible macro 2018-08-16 11:37:03 +02:00
Kyep
6c4def96f4 root cause: || binds too tightly 2018-08-08 11:29:39 -07:00
Kyep
2dd35bc894 Fixes 2018-08-08 10:39:25 -07:00
Aurorablade
ddb8093335 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello 2018-08-07 01:33:55 -04:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
Kyep
9f60bb8385 initial version 2018-07-26 12:12:08 -07:00
variableundefined
3b38d937b0 Economy refactors 2018-07-26 19:35:27 +08:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Crazy Lemon
8c27afad9a Merge pull request #9060 from Aurorablade/SpaceKoi 
Space Koi Event
 2018-07-13 23:04:52 -07:00
Aurorablade
9422d3a846 Suggested changes 2018-07-04 00:12:54 -04:00
Aurorablade
edbac20f4a maybe dis? 2018-07-02 17:03:02 -04:00
datlo
79643cb587 Make ion laws more specie inclusive 
Replaced instances of "Human" in ion laws by "Crew" to be more
compatible with the default Crewsimov and Corporate lawsets.
 2018-07-01 12:16:26 +02:00
Kyep
7c70f7d92e fixes grid check causing blue 2018-06-23 19:27:21 -07:00
Fox McCloud
5fb13096a2 Merge remote-tracking branch 'upstream/master' into weather-subsystem 
# Conflicts:
#	code/__DEFINES/layers.dm
 2018-06-13 16:56:19 -04:00
tigercat2000
9978e22487 Merge pull request #8893 from Ty-Omaha/CDC 
Adds more viruses to the Viral Outbreak event
 2018-06-10 17:50:14 -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
Aurorablade
5ae7eb3963 feedback update 2018-05-24 18:58:29 -04:00
Aurorablade
4e7aa78dca I can be stupid. 2018-05-23 01:38:32 -04:00
Aurorablade
dd997a0b20 some tweaks. 2018-05-23 01:34:58 -04:00
Aurorablade
c1d66ab81a KOI 2018-05-23 00:17:20 -04:00
Fox McCloud
6cdfe70303 Converts and Updates Weather Subsystem 2018-05-21 00:01:18 -04:00
Crazy Lemon
63ec546a0a Merge pull request #9008 from Fox-McCloud/remove-mode 
Removes All Modes
 2018-05-14 17:49:58 -07:00
Fox McCloud
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00