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
43,597 Commits 26 Branches 2 Tags
f7dcde22d781fd0bc0db35b51cd168b53075dba9
Commit Graph

546 Commits

Author SHA1 Message Date
variableundefined
6570c43e41 Merge pull request #11093 from Emanthealmighty/Collarchange 
Can now put a collar any animal that has gained sentience.
 2019-03-24 17:56:41 +08:00
Fox McCloud
4f99cc91d3 Merge remote-tracking branch 'upstream/master' into goonchem-reagent-temperature 2019-03-22 14:07:46 -04:00
Eman
515fb58163 Can now collar any animal that has gained sentience. 
This makes it so that upon becoming sentient, either by the xenobiology sentience/transference potion or by the random sentience event, it is possible to put a collar on you.
 2019-03-22 16:52:14 +01:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
Fox McCloud
f01af6ae20 Implements Goon Smoke 2019-03-15 19:09:29 -04:00
Kyep
1d95c8fce7 replace mother with princesses in infestation events 2019-02-23 23:24:55 -08:00
variableundefined
abe80802f7 Merge pull request #10913 from datlo/nogolemassassinate 
Prevent objectives from targeting offstation roles
 2019-02-19 22:15:11 +08:00
Arkatos1
2fb13ef034 Changed Aurora Caelus header when event is ending 2019-02-17 14:29:27 +01:00
datlo
91792b09c1 Prevent objectives from targetting offstation roles 
also remove nukie flavor text and prevent golem targetting
 2019-02-16 15:09:25 +00:00
variableundefined
2f04d5f6c4 Merge pull request #10861 from Emanthealmighty/Sentiencechange 
Sentience event changes.
 2019-02-14 21:36:06 +08:00
Kyep
108986174c handles welded vents 2019-02-10 01:43:47 -08:00
Kyep
591571f92b event terrors can no longer spawn next to living mobs 2019-02-10 01:37:38 -08:00
Eman
06306e22e4 Sentience event changes. 
Sentience will now add health to what the mob's health was, rather than just replacing whatever value there was with 200.
Sentience will now add 15 brute damage to whatever mob was selected for the event. This means that even passive mobs are able to deal damage now, and those that already did can deal even more damage.
 2019-02-09 14:07:54 +01:00
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