cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 01:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,177 Commits 26 Branches 2 Tags
e433e0283dea9724fa7b674dd7ba002467f6583a
Commit Graph

391 Commits

Author SHA1 Message Date
Crazy Lemon
c63d8008e2 Merge pull request #6233 from uraniummeltdown/events 
Tweaks Events
 2017-02-10 17:37:50 -08:00
uraniummeltdown
a8aef39625 enabled slaughter demon event 2017-02-10 17:32:11 +04:00
uraniummeltdown
bbe7663e21 fixed enter_link 2017-02-06 20:22:08 +04:00
uraniummeltdown
cd865ac1f2 revert immovable rod announcement change 2017-02-06 18:56:23 +04:00
Fox-McCloud
390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
uraniummeltdown
332deb840e Merge remote-tracking branch 'remotes/upstream/master' into events 
# Conflicts:
#	code/modules/events/immovable_rod.dm
 2017-02-05 14:04:45 +04:00
Fox-McCloud
f8602ffef8 last fixes, hopefully 2017-02-04 04:28:42 -05:00
Markolie
2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
 2017-01-31 17:44:38 +01:00
Kyep
6d6eec5934 Fixes initial Xenomorphs not appearing in Check Antagonists 2017-01-29 18:48:51 -08:00
Fox-McCloud
7f2e71b0df GC fixes and explosive vine fix 2017-01-28 11:06:42 -05:00
Fox-McCloud
b62cffadf8 glyphosate plantbgone change 2017-01-28 08:36:08 -05:00
Fox-McCloud
ec4add0ebf more fixes and runtime corrections 2017-01-28 04:03:33 -05:00
uraniummeltdown
c27454497a increased playercount delay 2017-01-26 20:47:16 +04:00
Fox-McCloud
b1f789e104 fixes a ton of thing 2017-01-24 03:23:16 -05:00
uraniummeltdown
1eec76088b tweaked playercount and decreased morph weight 2017-01-23 21:52:45 +04:00
Fox-McCloud
3e87bd3370 more adjustments and fixes 2017-01-23 05:56:17 -05:00
Fox-McCloud
7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud
706347fd84 even more work 2017-01-22 08:11:31 -05:00
Fox-McCloud
10c0e734c3 more work 2017-01-22 01:46:48 -05:00
uraniummeltdown
5fa8d33193 tweaked event delay, enabled morph, enabled immovable rod 2017-01-22 07:07:32 +04:00
Markolie
a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
 2017-01-20 23:43:35 +01:00
Markolie
01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
 2016-12-23 19:32:19 +01:00
Markolie
e2587dbbbf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm
 2016-12-23 19:04:35 +01:00
Fox-McCloud
9ace0245cf Removes Event Procs 2016-11-16 07:14:08 -05:00
Markolie
f63a9c279c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/defines/procs/announce.dm
#	code/modules/events/mass_hallucination.dm
 2016-10-31 14:46:58 +01:00
Markolie
ffc74cda0a Announcement fixes, change most command announcements to event announcements 2016-10-25 15:21:16 +02:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie
2e711d1337 Lay groundwork for megafauna, and add Ashdragon. 
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
 2016-10-23 23:15:57 +02:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
TullyBurnalot
13c6df5b38 Appendix-less mobs cannot contract appendicitis 2016-08-28 14:37:08 +01:00
Crazylemon64
16dd4e9d21 Moves many uses of log_to_dd to log_runtime, to make the output 
more visible at runtime, to someone who isn't watching DD first-hand
 2016-08-24 09:55:19 -07:00
TheDZD
5af653f3ea Merge pull request #5394 from Fox-McCloud/clientless-mobs 
Virus Outbreak and Appendicitis Clientless Blacklist
 2016-08-10 18:21:29 -04:00
Tigercat2000
58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm
 2016-08-10 14:16:42 -07:00
Fox-McCloud
e1179c339d Virus Outbreak and Appendicitis Clientless Blacklist 2016-08-09 08:05:12 -04:00
Tigercat2000
0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/objective.dm
 2016-08-08 06:21:02 -07:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
Isaac Erwin
f2c1c7406d Various grammar/spelling fixes 2016-08-05 18:43:33 -04:00
Crazylemon64
7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Fox-McCloud
a886b6a01f Wormhole Event Fixup 2016-08-02 23:17:33 -04:00
Krausus
dba8af8ab5 Removes dels and unused code that contains dels 2016-08-02 01:33:19 -04:00
Tigercat2000
9f3cdb43f7 special_role/objective refactor 
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
 2016-08-01 21:29:19 -07:00
Crazylemon64
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00
Fox-McCloud
62a780220d More Overload Lighting Performance 2016-08-01 15:29:47 -04:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
FreeStylaLT
45be3e37bb Adds electrical grid check to random events. 2016-07-21 22:46:16 +03:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Twinmold93
15ca46919e Rogue Drones Message Now NSV Instead of NMV (#4716) 
In the lore, it's the NSV Icarus, not the NMV Icarus. Just a
working/grammar fix.
 2016-06-19 13:25:49 -04:00
monster860
42639bcab5 Traders Event (#4016) 
* Traders Event

* lien notes

* Fixes indent

* Gets rid of things Fox doesn't like.

* how did that get deleted

* Get rid of things maintainers don't like

* Adds some crates to the shuttle, and a recall console to the base.

* EVENT_LEVEL_MAJOR, and make it weight 0 (out of rotation)

* line nutes
 2016-06-11 12:47:20 -04:00
Fox-McCloud
8ff32f4566 fixes 2016-04-18 22:53:31 -04:00