cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 14:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,428 Commits 26 Branches 2 Tags
cd23b41b20ce569ff42d4fbff00a789bdb3b9729
Commit Graph

623 Commits

Author SHA1 Message Date
AffectedArc07
04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
Fox McCloud
964f5e9cbc Merge pull request #13020 from farie82/nerf-sentient-animals 
Caps the health and damage of sentient animals
 2020-03-14 23:24:49 -04:00
farie82
872ffb5c1b Update sentience.dm 2020-03-14 22:08:30 +01:00
joep van der velden
9809e5f7b7 Review fixes 2020-03-08 11:49:15 +01:00
variableundefined
92f0df43bd Merge pull request #13043 from farie82/spoder-runtime-logging 
Terrors spiders can now spawn again. Logs the corrupt vent and continues
 2020-03-07 23:46:25 -05:00
Patrick Meade
52c43862b2 Traders on Red Alert spawns another event (#13078) 2020-03-07 12:03:47 -07:00
joep van der velden
46a7b7ef22 Logs some data and continues the loop 2020-02-28 09:13:53 +01:00
joep van der velden
d4188ee7cc Caps the healt and damage of sentient animals 2020-02-23 21:35:47 +01:00
Crazy Lemon
b97f31abc7 Merge pull request #12805 from Kyep/disable_floor_cluwne 
Disables floor cluwne random event
 2019-12-16 18:55:58 -08:00
Kyep
febda8b6ec Disables floor cluwne event 2019-12-14 13:07:58 -08:00
Patrick Meade
1881051171 Better to fix it all the way 2019-11-16 11:58:30 -06:00
Patrick Meade
a69d9afd39 Clean up for changes in PR #10861 2019-11-16 11:26:15 -06:00
Terilia
49a70daba0 A red headcrab day (#12396) 2019-10-27 00:26:34 -04:00
Ty-Omaha
ca71ab312b Xenomorph highpop spawn balance (#12508) 2019-10-27 00:15:47 -04:00
Fox McCloud
d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
 2019-09-28 00:16:11 -04:00
Pidgey
30bbc23b22 Issue #12331 - Stops bluespace anomaly from teleporting ghosts. (#12433) 2019-09-27 18:56:21 -07:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Ty-Omaha
2e26973c3c Increases timer for blob mouse spawn (#12359) 2019-09-24 15:11:12 -07:00
Fox McCloud
62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud
c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
 2019-09-21 12:40:07 -04:00
Terilia
4ea66b41ce New headcrabs! (#12352) 2019-09-20 19:04:41 -07:00
Fox McCloud
6711f92099 Merge pull request #12326 from Couls/missing-keyword-args 
fixes some missing arguments and runtimes
 2019-09-17 21:03:11 -04:00
Fox McCloud
5810d28571 Refactors Simple Mob Creation: Adjusts Which Mobs are Available (#12325) 2019-09-17 16:06:43 -07:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Coul
d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
3b0ff28ced Tweaks Space Carp Event: Improve Performance 2019-09-03 15:36:44 -04:00
Fox McCloud
3c874640f2 NO THE OPEN TURFS 2019-08-31 18:28:22 -04:00
Fox McCloud
3140255fc8 Reverts "Fixes Grid Check" 2019-08-26 00:44:46 -04:00
variableundefined
28980c0b79 Merge pull request #11862 from Ty-Omaha/grid-check-fix 
Fixes Grid Check
 2019-08-25 06:37:22 -04:00
variableundefined
4cebe6a08a Merge pull request #11719 from Terilia/headcrabs 
Headcrabs
 2019-08-23 15:16:30 -04:00
Fox McCloud
dc6fa07731 Merge pull request #11924 from TDSSS/larva-growth-boost 
gives event-spawned xeno larva  a growth boost
 2019-08-21 02:03:51 -04:00
Terilia
a134228787 removes unneeded spawn and nerfs headcrabs a little. 2019-08-15 12:24:28 +01:00
variableundefined
ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol 
Observer/hud improvements and fixes
 2019-08-11 16:23:23 +08:00
Mark van Alphen
14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix 
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
 2019-08-09 23:38:49 +02:00
TDSSS
f18df9e6eb gives event larva a growth boost 2019-07-26 18:55:49 +02:00
Mark van Alphen
02d0d44ebe Processing fix 2019-07-20 18:53:05 +02:00
Mark van Alphen
fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Ty-Omaha
c8ccc3bb94 k 2 2019-07-15 09:10:41 -04:00
Ty-Omaha
b9d9b3c88d k 2019-07-15 09:10:00 -04:00
Ty-Omaha
e042d114dd lol 2019-07-15 09:06:59 -04:00
Ty-Omaha
12f1bb1de8 power 2019-07-15 08:43:05 -04:00
Couls
7886366d87 Update disease_outbreak.dm 2019-07-11 02:36:30 -04:00
Terilia
c4339ec3ce Merge branch 'master' into headcrabs 2019-07-10 12:47:08 +01:00
variableundefined
8d57a2f736 Merge pull request #11605 from Couls/disease-rework 
rework disease outbreak event
 2019-07-09 18:24:38 +08:00
xerdies
8abf6f8985 Typo fix 2019-06-17 23:54:19 +01:00
Terilia
791f8cad8e Reduced maximal number of possible headcrabs to 0. Flavour text. 2019-06-17 02:08:45 +01:00