Kassc Zeravla
8f9138161c
Merge remote-tracking branch 'Kazzc/SC-MapUpdate' into SC-MapUpdate
2020-11-21 21:49:03 -05:00
Kassc Zeravla
d055d0b247
Minor edit
...
removed the toy vendor.
2020-11-21 21:48:55 -05:00
cadyn
267feee4fe
Merge branch 'SC-MapUpdate' of https://github.com/Kazzc/CHOMPStation2 into pr/884
2020-11-21 18:42:12 -08:00
cadyn
968bc08283
Apparently we were missing this sprite bruh
2020-11-21 18:42:04 -08:00
Kassc
9d660c4222
Merge pull request #1 from CHOMPStation2/master
...
merge master into branch
2020-11-21 21:24:20 -05:00
cadyn
9a726c7e5c
Merge pull request #886 from CHOMPStation2/dirty_synth_fixerooni
...
Fix traits thinking non-synths are synths because their other character was a synth or whatever
2020-11-21 18:06:18 -08:00
Razgriz
94b6c737aa
Merge pull request #866 from CHOMPStationBot/upstream-merge-9310
...
[MIRROR] PosterAdds
2020-11-21 15:18:23 -07:00
Razgriz
0b2e422599
Disable donteatpets_vr
2020-11-21 15:10:29 -07: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
fd064a92c5
Undelete ties.dmi
2020-11-21 11:54:02 -08:00
Razgriz
6c041d67d9
Merge pull request #885 from CHOMPStation2/cadyn-patch-2
...
Tweaking metroids a bit
2020-11-21 11:42:18 -07:00
Kassc Zeravla
09c07c4608
Travis
...
Can you not?
Central Command.
-Fixed a single miss-placed object
2020-11-21 12:08:33 -05: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
03ccdbcba9
Resolve conflict, accept active seromi_vr, deactivate seromi_yw.dm
2020-11-21 00:20:34 -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
Razgriz
f4f05417a5
Merge pull request #875 from CHOMPStationBot/upstream-merge-9329
...
[MIRROR] Fixes PDA Alert Icons
2020-11-19 22:25:31 -07: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
Chompstation Bot
2194f7ef16
Fixes PDA Alert Icons
2020-11-20 00:54:20 +00: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
8bc11c9c4f
Merge pull request #868 from CHOMPStationBot/upstream-merge-9320
...
[MIRROR] Expands Surfmed among other things take 2
2020-11-19 12:58:52 -07: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
