cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,062 Commits 5 Branches 0 Tags
dbca9f61fc63b2d54ca8e19df6d9c35f28a059a0
Commit Graph

11891 Commits

Author SHA1 Message Date
Chinsky
dbca9f61fc Merge pull request #10234 from Baystation12/dev-freeze 
Dev freeze -> Dev
 2015-07-18 23:56:10 +03:00
Chinsky
f7871e6d08 Merge pull request #10231 from GinjaNinja32/spanclassbalance 
Fixes <span class='class>, makes Travis check it
 2015-07-18 23:55:15 +03:00
PsiOmegaDelta
23736bc42b Merge pull request #10233 from Baystation12/master 
Master -> Dev-freeze.
 2015-07-18 22:45:44 +02:00
GinjaNinja32
0c1aee8074 Fixes <span class='class>, makes Travis check it 2015-07-18 21:13:32 +01:00
Chinsky
3a40f4e539 Merge pull request #10225 from PsiOmegaDelta/150718-BurnItAway 
Fixes #10170.
 2015-07-18 22:57:06 +03:00
PsiOmegaDelta
8b769c5d24 Merge pull request #10195 from Kelenius/ofSpaceAndWounds 
Of space and wounds
 2015-07-18 20:04:39 +02:00
PsiOmega
8aac45bc42 Fixes #10170. 
Overrides the AI attack proc.
Saving any  removal of burners for the dev branch due to merge concerns.
 2015-07-18 19:36:01 +02:00
Kelenius
4e2049ccaf Removes a colon 2015-07-18 14:53:35 +03:00
PsiOmega
7dc5e7e3af Compilation fixes. 2015-07-17 23:21:59 +02:00
PsiOmega
34b0517578 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/topic.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/nano/modules/atmos_control.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
 2015-07-17 23:19:34 +02:00
PsiOmega
d1a05d9fd6 Compilation fixes. 2015-07-17 23:11:42 +02:00
PsiOmega
b4d15ceb6e Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/inventory.dm
 2015-07-17 23:09:24 +02:00
HarpyEagle
bcd81af4f6 Bandaid fix for sealed rig removal 2015-07-16 10:52:26 -04:00
PsiOmegaDelta
dadb262ea1 Merge pull request #10192 from Kelenius/ofImprinterAndProhon 
Of imprinter and prohon
 2015-07-16 08:36:17 +02:00
GinjaNinja32
6ec39e1f51 Fixes 'plural' gender and fixes some instances of not using the t_* variables 
Todo: fully rework this to not need lots of t_* variables, they're annoying and kinda crappy. Maybe a gender datum; /datum/gender/male/var/he = "he" or something.
 2015-07-15 19:00:54 +01:00
Kelenius
b8a354467e Fixes #9967 
Pulling someone through space or an area without gravity will no longer
deal damage to them
 2015-07-15 18:27:27 +03:00
Chinsky
a0e0cc5cd5 Merge pull request #10194 from GinjaNinja32/isAI 
removes isAI() from broken merge
 2015-07-15 18:26:32 +03:00
GinjaNinja32
efaf8659b8 Fixes usage of isAI() 2015-07-15 15:51:11 +01:00
GinjaNinja32
e2d7fd9e14 removes isAI() from broken merge 2015-07-15 15:45:55 +01:00
Kelenius
4c8dfcf17e Fixes #10127, fixes #10139 
Removes phoron requirement from shield circuit, adds a return to sheet
adding so ..() is not called when attacked with a sheet.
 2015-07-15 16:49:22 +03:00
Kelenius
3de25ceb00 Fixes #8161 2015-07-15 16:34:05 +03:00
Zuhayr
c779482afc Merge with dev. 2015-07-15 16:20:39 +09:30
Zuhayr
03927918c6 Merge pull request #10187 from Baystation12/master 
Master > dev-freeze
 2015-07-15 16:10:13 +09:30
Zuhayr
a6ec43f0b1 Merge pull request #10176 from mwerezak/ce-rig-fix 
Fixes #8545
 2015-07-15 06:48:45 +09:30
Zuhayr
c6d095aef1 Fixes #10118 2015-07-15 06:46:21 +09:30
HarpyEagle
be34a7cfc7 Fixes projectiles ignoring their specified target zone 2015-07-14 14:20:53 -04:00
HarpyEagle
bf2bcba01c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into ert-lights2 2015-07-14 10:15:37 -04:00
PsiOmegaDelta
9ffdb161dc Compilation fixes. 2015-07-14 08:28:01 +02:00
PsiOmegaDelta
e2e08a226d Removes update_canmove() proc in simple_animal/Life() as it's now called in living/Life(). 2015-07-14 08:24:41 +02:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
 2015-07-14 08:21:12 +02:00
PsiOmegaDelta
8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-07-14 08:11:11 +02:00
mwerezak
5ab051d7a8 Fixes #8545 2015-07-14 00:38:58 -04:00
Zuhayr
b12d1d4bdd Refactors spiderbots a little, cleans up some spans, updates them. 2015-07-14 06:56:52 +09:30
Zuhayr
5e1ae26b74 Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze. 2015-07-14 05:19:01 +09:30
Zuhayr
cd380aba24 Removed the last few references to MODE, fixed some oversights with player_is_antag(). 2015-07-14 05:19:00 +09:30
Zuhayr
9376e33acf Fixes #10159 2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2 Fixes #10129 2015-07-14 05:18:58 +09:30
Zuhayr
af7c87366e Fixes #10137 2015-07-14 05:18:57 +09:30
HarpyEagle
883ce8b7c1 Merge remote-tracking branch 'upstream/dev-freeze' into ert-lights2 2015-07-13 10:46:48 -04:00
Ccomp5950
e6481d4a2c Merge pull request #10168 from Kelenius/ofCowsAndTables 
Fixes #8294
 2015-07-13 10:03:38 -04:00
Kelenius
765731f7d5 Fixes #8294 
Fuck mobcode.
 2015-07-13 16:51:46 +03:00
Ccomp5950
889019b445 Merge pull request #10163 from PsiOmegaDelta/150713-Fixes 
Fixes
 2015-07-13 09:35:58 -04:00
Kelenius
678027d93d Fixes #10145 2015-07-13 11:01:32 +03:00
PsiOmega
f601ba45d6 Fixes #10144. 
Fixed depricated type path.
 2015-07-13 09:53:21 +02:00
mwerezak
0fc12eb22b Fixes #9927 
Fixes issues with deca code crates.
 2015-07-13 00:45:36 -04:00
mwerezak
0b2b475be4 Adds lights to ERT shuttle, ERT ready light 
Fixes #10155
 2015-07-12 18:41:24 -04:00
Zuhayr
52cc850bf8 Merge pull request #10115 from PsiOmegaDelta/150712-SolidJaunting 
Wizards can no longer de-jaunt in turfs with dense objects.
 2015-07-13 06:14:44 +09:30
GinjaNinja32
b04ed47e2f Merge pull request #10070 from Mloc/lightwrite-2 
Lighting overlay changes + optimizations
 2015-07-12 15:51:44 +01:00
Mloc
bd705fb7e0 optimize apply/remove_lum 
Light sources no longer track applied lumcounts in an assocative list,
using shared-indices with the applied turf list instead.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-12 15:47:17 +01:00
Mloc
291f0b8556 client optimizations for lighting overlays 
Removes lighting transitions- they don't work with the new system.
Greyscale overlays now use BLEND_OVERLAY instead of BLEND_MULTIPLY for
better client performance.
Light overlays in total darkness are now made invisible.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-12 15:47:13 +01:00