Commit Graph

28156 Commits

Author SHA1 Message Date
Razgriz 61baa91b22 Merge pull request #887 from CHOMPStationBot/upstream-merge-9336
[MIRROR] Fixes Proteans not retaining languages in blob form, gives Proteans Feeder ability
2020-11-22 03:41:36 -07:00
Razgriz b6e792ed4e Merge pull request #881 from CHOMPStationBot/upstream-merge-9330
[MIRROR] Eventy stuff and pet protections!
2020-11-22 03:40:21 -07:00
cadyn e32cc58cb7 Merge pull request #877 from cadyn/ballistics-v3
Ballistics v3
2020-11-22 01:09:17 -08:00
cadyn 425ce61041 Merge pull request #884 from Kazzc/SC-MapUpdate
Civilian sector overhaul.
2020-11-22 01:08:56 -08:00
cadyn 254d4b7bf9 Merge pull request #888 from CHOMPStation2/Metroid1.1
Metroid Event and tweaks
2020-11-22 01:07:26 -08:00
Razgriz c88a691f8b Remove stuff for pacify metroid 2020-11-22 01:14:52 -07:00
Razgriz d2114cba9b Metroid Event and tweaks
-Baby metroids now have a chance of spawning as part of a new major severity event.

-All slime references within metroid code has been removed.

-Some general stats of metroids have been tweaked.
2020-11-22 01:00:16 -07:00
Novacat 08900e9e4a Merge pull request #9336 from Tenryumi/blobs-speak-languages-too
Fixes Proteans not retaining languages in blob form, gives Proteans Feeder ability
2020-11-22 04:51:39 +00:00
cadyn 2d06259229 Merge pull request #880 from CHOMPStationBot/upstream-merge-9312
[MIRROR] Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings
2020-11-21 19:58:29 -08:00
Razgriz 9b44e90793 Merge pull request #878 from CHOMPStation2/Metroid1.0
Metroid 1.0
2020-11-21 20:53:32 -07:00
cadyn a8d22c84a8 fix stupid shit 2020-11-21 19:12:41 -08:00
cadyn 1da78774a8 Even more conflicts. Yum. 2020-11-21 18:52:36 -08:00
cadyn c23558a35d More conflicts yay 2020-11-21 18:51:16 -08:00
Kassc 9d660c4222 Merge pull request #1 from CHOMPStation2/master
merge master into branch
2020-11-21 21:24:20 -05:00
cadyn 0ce5d797be Update 07_traits.dm 2020-11-21 14:06:36 -08:00
cadyn ca04b0ef72 Make the station gateway work :p 2020-11-21 13:24:49 -08:00
cadyn 01f889774e Changing it here too 2020-11-21 08:24:35 -08:00
cadyn 0e616ab2e1 Using the Global Vars system for queen_amount :v 2020-11-21 08:21:29 -08:00
cadyn 148ce00235 borkfixes 2020-11-21 08:09:11 -08:00
Razgriz 141801ef7f Merge pull request #856 from CHOMPStation2/Razgriz1032-patch-4
Prevent spiders and grubs from spawning in dorms and docks
2020-11-21 02:49:58 -07:00
Razgriz 914b5450b2 Merge pull request #879 from CHOMPStation2/Razgriz1032-patch-2
Hotkeys by default
2020-11-21 02:48:56 -07:00
Kassc Zeravla ddc68a5917 Civilian sector overhaul.
SC Floor 2
-Overhaul to the civilian sector.
-Merged Cafeteria with Library
-Dorm section is now being remodeled (Will reconstruct to a Gym)
-Old cafeteria is now a snacking room for holodeck.

SC Floor 3
-Added a gateway that is currently under construction (Future arrival point for players)
-Modified and editied some of the dorms and content laying around.

Central Command
-Fixed a wall that lead to space.

SC Areams.DM
-Added additional areas for the third floor. Such as gateway area and its hallways.

Scarf icon update.
Zebra Scarf and Xmas Scarf got a sprite update, credit goes to "ProgrammerDuck"
2020-11-21 03:31:40 -05:00
Razgriz 0f8b250789 Merge pull request #882 from CHOMPStation2/master
Master into Metroids1.0 Branch
2020-11-21 01:20:56 -07:00
Razgriz 998efd6f6f ugh 2020-11-21 00:35:37 -07:00
Razgriz 64122fa2a4 Nutrition and attack time updates 2020-11-21 00:11:36 -07:00
Razgriz 81b36f8578 Merge pull request #872 from CHOMPStation2/Razgriz1032-patch-1
ranged_cooldown_time variable for mobs
2020-11-21 00:02:35 -07:00
Chompstation Bot 26da4ae3f2 Eventy stuff and pet protections! 2020-11-20 17:28:59 +00:00
Chompstation Bot 2e15527ef0 Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings 2020-11-20 15:44:21 +00:00
cadyn 77a4076fd6 Forcing the glory of 5.7x28 onto my formulas 2020-11-19 21:05:47 -08:00
Razgriz 6a8749d257 Hotkeys by default
It's 2020, use your WASD keys by default. Flipped to True
2020-11-19 21:48:52 -07:00
Razgriz 5762ef8a25 Metroid 1.0
Finally. Adds the full SR388 metroid bestiary. You got baby metroids, super metroids, alpha, gamma, zeta, omega, and queen. They are weak to bullet-type weapons and most are super weak to bombs.

The baby and supers act just like slimes in that they will succ head, so click them to get them off. The rest can still gain nutrition via melee and vore. If they get enough nutrition, they will evolve to their next phase.

Cold guns will do 100 damage per tick to baby and super metroids. The rest lose their cold vulnerability.
2020-11-19 20:45:37 -07:00
Razgriz a3726c1d91 Update spider_infestation.dm 2020-11-19 20:36:44 -07:00
Razgriz cd746f4dbc Update grubinfestation_vr.dm 2020-11-19 20:36:35 -07:00
Razgriz 3ab4412488 Update spider_infestation.dm 2020-11-19 20:19:40 -07:00
Razgriz f371fa744a Update grubinfestation_vr.dm 2020-11-19 20:19:36 -07:00
Razgriz bd1dbb0eb6 Almost forgot spiders 2020-11-19 19:36:06 -07:00
Razgriz 1ad488dc85 Update grubinfestation_vr.dm 2020-11-19 19:35:25 -07:00
Cadyn 7f1579061b Ballistics v3 2020-11-19 17:02:22 -08:00
Novacat 33b34f6d2e Merge pull request #9329 from Novacat/nova-basicfixes
Fixes PDA Alert Icons
2020-11-20 00:54:20 +00:00
Razgriz 1a192a6a9b Update simple_mob.dm 2020-11-19 13:43:54 -07:00
cadyn cbc538f529 Fix bullshit 2020-11-19 12:43:22 -08:00
cadyn bf5104bd54 Fix the bullshit 2020-11-19 12:41:43 -08:00
Razgriz 12c5ca5ef4 Merge pull request #867 from CHOMPStationBot/upstream-merge-9301
[MIRROR] Adding New Foods
2020-11-19 12:57:00 -07:00
Razgriz 3dcd6240d5 ranged_cooldown_time variable for mobs
This is the addition of a new mob variable that will allow mobs to move and shoot at the same time. This section here is special snowflake code for metroids only, or for whatever else in the future that you want to have move and shoot at the same time. Basically, this is a non-stupid version of "ranged_attack_delay." "ranged_attack_delay" is stupid because it sleeps the entire mob. This new ranged_cooldown_time is smarter in the sense that it is an internalized timer. Try not to confuse the names.
2020-11-19 04:05:03 -07:00
Razgriz 744bbc9bc9 Merge pull request #870 from CHOMPStation2/Razgriz1032-patch-7
Mouse spontaneous vore changes
2020-11-19 03:09:57 -07:00
Razgriz 42a48c43dd Merge pull request #869 from CHOMPStation2/Razgriz1032-patch-6
Fix OOC Escape cancellation
2020-11-19 03:09:35 -07:00
Razgriz 1ad25e5cdb Mouse spontaneous vore changes
For mice, I changed the following:
Allowed for being spontaneous prey.
Disallowed for being spontaneous predator.
2020-11-19 01:47:09 -07:00
Razgriz cbf220a4b7 Undo accidental commit to master with another commit to master
lol
2020-11-19 01:46:26 -07:00
Razgriz 3fece6ec6b Mouse spontaneous vore changes
For mice I changed the following:
Allowed for being spontaneous prey.
Disallowed for being spontaneous predator.
2020-11-19 01:45:39 -07:00
Razgriz 34ae4d5fc1 Update living_vr.dm
Problem: Pressing cancel would eject someone from belly anyway.

Solution: Fix code.

I am actually entertained that that this has been around for years and only now someone has actually clicked cancel :P
Also entertained that the following condition has a != operator but not the former.
2020-11-19 01:41:26 -07:00