cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,362 Commits 5 Branches 0 Tags
36755f077c94bbdd4db12836ea8c901b39daae86
Commit Graph

12939 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
mwerezak
db95743784 Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair 
Converts some loc = to forceMove()
 2015-09-14 12:11:09 -04:00
Kelenius
eef1013db2 Fixes #10925 
Makes psilocybin less robust, also cuts down emote spam
 2015-09-14 16:54:24 +03:00
PsiOmegaDelta
bb5680193f Converts some loc = to forceMove() 
Fixes #11102.
 2015-09-14 11:13:15 +02:00
Kelenius
9dd6f9762a Resolves #11049 2015-09-14 12:05:28 +03:00
PsiOmegaDelta
b79f061877 Merge pull request #11103 from GinjaNinja32/pills 
fix pill attack_log entry, switch to using key_name
 2015-09-14 07:31:07 +02:00
GinjaNinja32
e29f5d108c fix pill attack_log entry, switch to using key_name 2015-09-14 06:24:49 +01:00
PsiOmega
a938c7b648 Prevents observer mice from spawning on the admin Z-level. 2015-09-13 11:35:47 +02:00
PsiOmega
0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
 2015-09-13 10:52:01 +02:00
PsiOmega
830d2feb0d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
 2015-09-13 10:44:06 +02:00
mwerezak
810ca147d0 Fixes #10710 2015-09-12 19:34:43 -04:00
PsiOmega
8d57b2d0a0 Fixes observers being unable to see silicon antag status. 
target_list contains mob/living mobs while the previous loop only looped over living/carbon/human.
To make things a bit of a headache hud_list is defined separately for living/carbon/human and living/silicon, instead of directly on /living.

It is certainly possible to define hud_list at mob/living instead but adding an extra loop for silicons is the method that is least likely to break things, thus the most appropriate for a master fix.
 2015-09-12 14:39:10 +02:00
PsiOmegaDelta
26f533bb01 Merge pull request #11076 from PsiOmegaDelta/dev 
Dev
 2015-09-12 13:17:47 +02:00
PsiOmega
e722da01f6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
 2015-09-12 13:10:29 +02:00
PsiOmega
834d93df00 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-12 12:51:22 +02:00
GinjaNinja32
30782cde8f Remove the need to map in the title screen, move title screen icons into a single file 2015-09-12 08:34:28 +01:00
mwerezak
26f1d02bda Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
 2015-09-11 18:13:14 -04:00
Chinsky
adf19d674b Merge pull request #11055 from mwerezak/coffee-fix 
Returns coffee jitteriness to an overdose effect
 2015-09-11 22:49:35 +02:00
Chinsky
83f4425826 Merge pull request #11062 from Sligneris/patch-5 
Sensors - removing the random period from the action verb
 2015-09-11 22:49:28 +02:00
SomeoneElse
7e4191d212 [minor] Fix ATM transfer code, remove badly placed 'break'. 
code/modules/economy/Accounts.dm:
	remove break from charge_to_account()
 2015-09-11 16:44:00 +06:00
GinjaNinja32
8536fb08eb Merge branch 'dev' into vv 2015-09-11 08:06:44 +01:00
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
 2015-09-11 08:54:03 +02:00
PsiOmegaDelta
0b433eb90c Code relocation. 2015-09-11 08:45:49 +02:00
PsiOmegaDelta
f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-09-11 08:38:28 +02:00