cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,017 Commits 8 Branches 0 Tags
080e526e9ee6ff8fb0f91ff8d0d86e3b133ff08b
Commit Graph

21008 Commits

Author SHA1 Message Date
Zuhayr
7d7f0da2ca Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable 
Species tweaks
 2015-09-21 19:08:53 +09:30
Chinsky
02661be540 Merge pull request #11136 from PsiOmegaDelta/150918-BiasedMeteors 
Meteor events are now direction biased.
 2015-09-21 11:54:10 +03:00
Chinsky
5243626724 Merge pull request #11157 from PsiOmegaDelta/150920-ThunderdomeExclamationmark 
Map tweaks.
 2015-09-21 11:49:47 +03:00
PsiOmegaDelta
40144779e9 Merge pull request #11162 from SkyMarshal/multi-z 
Updates/fixes stairs.
 2015-09-21 07:08:20 +02:00
SkyMarshal
8b225e4ba6 Update to stairs. 2015-09-20 18:25:23 -07:00
LightningIron
9e2edf5ab4 Fixes #11145. 2015-09-20 19:42:54 -05:00
Hubblenaut
ced4ce268c Adds Syndicate ID sprite 2015-09-20 21:11:49 +02:00
PsiOmegaDelta
4cc2b1a93e Glowy items. 
Energy shields now glows slightly stronger than stunbatons when active.
 2015-09-20 18:18:19 +02:00
PsiOmegaDelta
7d975aa36f Map tweaks. 
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
 2015-09-20 17:59:57 +02:00
PsiOmegaDelta
d891fba1cc Mob size tweaks. 
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
 2015-09-20 17:12:07 +02:00
PsiOmegaDelta
292c1545cb Species datums now include pass flags. 
Utilized to allow Pun-Pun and other monkeys to once again climb tables.
 2015-09-20 16:13:20 +02:00
Chinsky
6103f688cf Merge pull request #11143 from PsiOmegaDelta/150919-GlowyThings 
More glowy stuff.
 2015-09-20 04:51:01 +03:00
Chinsky
842f11a087 Merge pull request #11129 from PsiOmegaDelta/150917-LanguageReset 
Adds language prefix reset option.
 2015-09-20 04:45:13 +03:00
PsiOmegaDelta
bd3b4c5d81 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-19 21:37:05 +02:00
PsiOmegaDelta
de9e68cdcd Merge pull request #11151 from Baystation12/master 
Dev-freeze
 2015-09-19 21:25:15 +02:00
PsiOmegaDelta
59c5807157 Active stunbatons now glow. 2015-09-19 21:12:19 +02:00
PsiOmegaDelta
59f7b889d4 Constant fix. 2015-09-19 20:54:43 +02:00
Hubblenaut
4eef7ab65d Fixes beds occasionally buckling in odd directions 2015-09-19 15:27:24 +02:00
PsiOmegaDelta
fa6799ec3a APCs now produce a glow. 
APCs now produce a glow, with similar range and strength as fire and air alarms.
 2015-09-19 10:12:02 +02:00
PsiOmegaDelta
d65ebf8b90 Meteor events are now direction biased. 
When a meteor event triggers it now selects a main edge to arrive from, with a 20% probability to come from either neighboring edge. Will never arrive from the opposite edge.
The meteor event end time is now made more useful, and is based on a longest delay between meteor waves scenario.
The meteor event now supports multiple station Z-levels.
Removes the meteor sounds, as they can rarely be heard over the explosions anyway.
 2015-09-18 21:45:15 +02:00
PsiOmegaDelta
8421058ece Adds language prefix reset option. 
Allows you to reset the language prefix key to the server defaults. Mostly a convenience thing.
Adds missing reserved say character.
 2015-09-18 21:42:02 +02:00
PsiOmegaDelta
2d01a06f00 Corrects world-edge math. 
Meteors coming from the east would immediately be transfered to another Z-level and deleted, due to being considered outside the Z-level transition border.
 2015-09-18 15:23:18 +02:00
GinjaNinja32
780db3314d Merge pull request #11128 from PsiOmegaDelta/150917-BumpyRide 
Fixes Pun-Pun (and other small mobs) pushing people around.
 2015-09-18 08:20:35 +01:00
PsiOmegaDelta
232dd5bfb1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
 2015-09-18 08:51:10 +02:00
PsiOmegaDelta
9946c837e4 Merge pull request #11134 from Baystation12/master 
Dev-freeze
 2015-09-18 08:50:11 +02:00
Zuhayr
1d7150ecd6 Merge pull request #11127 from PsiOmegaDelta/150917-MassiveNumberofMeteors 
Meteors no longer impact with each other.
 2015-09-18 14:34:14 +09:30
Chinsky
7a2183e97e Merge pull request #11107 from Kelenius/reishiJitter 
Fixes  #10925
 2015-09-18 06:08:44 +03:00
PsiOmegaDelta
dcc4655026 Merge pull request #11112 from caelaislinn/missing_spawn 
QOL feature for mappers
 2015-09-17 21:11:52 +02:00
PsiOmegaDelta
0e4f51413b Merge pull request #11074 from GinjaNinja32/title 
Title screen update
 2015-09-17 21:11:31 +02:00
PsiOmegaDelta
f65649c8ba Fixes Pun-Pun (and other monkeys) pushing people around. 
At some point a return had snuck in before the mob-push/swap flag settings. I blame a merge.
Relocated that code to handle_post_spawn() to hopefully ensure it'll always fire when appropriate.
 2015-09-17 09:40:19 +02:00
PsiOmegaDelta
eb2151c118 Meteors no longer impact with each other. 
This increases the number of meteors which survive to reach the station, as there is some tendency for them to spawn on the same location (but not necessarily fly in the same direction).
 2015-09-17 09:08:09 +02:00
GinjaNinja32
a7ed0ff2fb Merge pull request #11124 from PsiOmegaDelta/150916-LawChanneling 
Makes the additional law channel handling more flexible.
 2015-09-17 06:27:41 +01:00
Chinsky
412380c3ab Merge pull request #11110 from GinjaNinja32/cleaning 
fix #11061
 2015-09-17 05:43:11 +03:00
Chinsky
5d1b1cd123 Merge pull request #11096 from PsiOmegaDelta/150913-SneakyMice 
Prevents observer mice from spawning on the admin Z-level.
 2015-09-17 05:42:15 +03:00
Chinsky
5383bc129b Merge pull request #11120 from PsiOmegaDelta/150916-DefineMe 
Macro refactoring.
 2015-09-17 05:39:14 +03:00
Chinsky
7e9c84c0f6 Merge pull request #11122 from PsiOmegaDelta/150915-PowernetDestroy 
Improves powernet destruction.
 2015-09-17 05:38:38 +03:00
PsiOmegaDelta
48ce35a179 Makes the additional law channel handling more flexible. 
It has no particular purpose at this time, except to be a general improvement.
 2015-09-16 16:36:04 +02:00
GinjaNinja32
73078a19ce Merge pull request #11091 from mwerezak/lighting-fix 
Fixes #10710
 2015-09-16 14:59:39 +01:00
Dennok
536a3a6070 fix #10882 2015-09-16 14:34:20 +03:00
PsiOmegaDelta
7ce27f76fd Macro refactoring. 
Turns several of the is* procs into istype defines.
 2015-09-16 12:57:14 +02:00
GinjaNinja32
24ba93c3fa Merge pull request #11108 from FalseIncarnate/master 
Invisible / Missing Growth State Fix
 2015-09-16 09:48:32 +01:00
PsiOmegaDelta
f8a38ec7cf Improves powernet destruction. 
While we currently do hard del datums this is a step towards a better world.
 2015-09-16 08:00:22 +02:00
Cael Aislinn
00c9402656 enables spawning at latejoin landmarks instead of space if unable to find appropriate job spawn landmark 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-09-16 12:48:37 +10:00
PsiOmega
e731127b1c Corrects HTML tag mismatch. 2015-09-15 20:39:33 +02:00
PsiOmega
5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
 2015-09-15 20:25:13 +02:00
GinjaNinja32
6a61269edd Merge pull request #11106 from Kelenius/jetpackFixes 
Fixes for jetpacks and gas tanks
 2015-09-15 15:06:58 +01:00
GinjaNinja32
52b51a6be4 fix #11061 2015-09-15 13:24:11 +01:00
Kelenius
baebd62c26 Fixes tank examine() 2015-09-15 10:14:07 +03:00
FalseIncarnate
4a9dc8dc8f Invisible / Missing Growth State Fix 
Fixes a number of plants seemingly randomly having invisible plant
growth states.
- This was caused by overly-rounded math resulting in attempts to call
growth states that do not exist.
 2015-09-14 17:35:33 -04:00