cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 23:29:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 8 Branches 26 Tags
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

11085 Commits

Author SHA1 Message Date
PsiOmega
b55be47521 Adds dusty warning stripes. 2015-08-16 06:08:10 -07:00
PsiOmega
076a456d6f Adds additional floor icons. 
Adds additional grey and lime cornel decal icons.
Adds directional Space Station 13 icons.
 2015-08-16 06:08:01 -07:00
PsiOmega
aa475ea23c Adds (dirty) steel tiles. 2015-08-16 06:07:59 -07:00
PsiOmega
593023443f Fixes floor decal dir and layer not being respected. 2015-08-16 06:07:58 -07:00
PsiOmega
11fe86da58 More floor decals. 
Adds additional red decal icons.
Adds grey outline decal.
 2015-08-16 06:07:54 -07:00
PsiOmega
ddcc06d55f Additional floor decal icons. 
Adds grey, purple, and white floor decals.
Adds full red and yellow floors, both for floor and floor tile.
Makes the U-shaped warning sprites match the straight and L-shaped sprites.
 2015-08-16 06:07:51 -07:00
mwerezak
ca253677ef Adds more flooring decal types 2015-08-16 06:07:45 -07:00
Zuhayr
3a64ffcb09 Changes flooring to use /decl/flooring 2015-08-16 06:07:39 -07:00
Kelenius
7c1d9b5614 Mech chargers are now a single machine 
Can be built and upgraded
Resolves #5215
 2015-08-16 06:07:36 -07:00
Zuhayr
c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and 
construction/deconstruction. Major map rework/changes.
 2015-08-16 06:05:21 -07:00
mwerezak
4a0a6e7163 Fixes pipes disappearing when wrenching fails 2015-08-16 06:04:39 -07:00
Kelenius
9235cea379 Fixes #9332 2015-08-16 06:04:38 -07:00
GinjaNinja32
7dc85cfdd4 Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates 
Computers are now overlay based.
 2015-08-16 00:40:47 +01:00
mwerezak
77ddae4e26 Structures now take damage properly from projectile clouds 2015-08-15 19:08:45 -04:00
mwerezak
a773715ff9 Adds frag grenade sprites 2015-08-15 18:47:35 -04:00
Zuhayr
eccdfd8d9a Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-16 05:45:16 -07:00
Zuhayr
7e8713039a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-16 05:40:47 -07:00
mwerezak
4b21f5f8ad Fixes pipes disappearing when wrenching fails 2015-08-15 15:46:52 -04:00
PsiOmega
b879db05b4 Makes the fake crew record creation utilize all the new id fields. 2015-08-15 17:03:19 +02:00
PsiOmega
c51e208094 One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686. 2015-08-15 15:22:37 +02:00
Kelenius
24fb46f1a9 Fixes #9332 2015-08-15 13:05:49 +03:00
PsiOmega
c81ad0964e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
 2015-08-15 11:06:03 +02:00
PsiOmega
3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
 2015-08-15 10:52:17 +02:00
PsiOmega
f1d481b763 Removes a magical tab. 2015-08-15 10:24:01 +02:00
mwerezak
c455cef9a5 More frag grenade tweaks 
Finalizes frag grenade values, fragments no longer produce admin logs, and comments out debugging code.
 2015-08-15 03:19:47 -04:00
mwerezak
8b08f8ff34 Fixes explosions deleting projectiles 2015-08-15 02:51:02 -04:00
mwerezak
4092b40ae5 Updates frag grenades to use bresenham, tweaks 2015-08-15 02:41:32 -04:00
Null Snapshot
0255b79114 Fixes a problem with crates containing animals not spitting out their mobs. 2015-08-14 22:47:53 -07:00
Snapshot
5f5671d21f Merge pull request #10647 from mwerezak/acids 
Fixes #10645
 2015-08-14 22:22:41 -07:00
mwerezak
133bc96344 Fixes #10645 
Sets unacidable where appropriate.
 2015-08-14 23:20:10 -04:00
GinjaNinja32
88433b6b98 Merge pull request #10641 from atlantiscze/kill-all-humans 
Newmalf Fixes
 2015-08-15 03:36:35 +01:00
Zuhayr
73e15512f4 Made landmarks simulated (so that pods don't qdel them, oops) 2015-08-14 16:39:44 -07:00
Atlantis
e7adce2163 Better feedback 
- Attempting to hack already hacked APC now correctly produces "You already control this APC" message.
 2015-08-14 22:51:59 +02:00
Chinsky
d05b44bec4 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette 2015-08-14 19:59:52 +03:00
Chinsky
f024b77697 Merge pull request #10630 from mwerezak/fix 
Fixes bad ammo_magazine path
 2015-08-14 19:06:33 +03:00
PsiOmegaDelta
54616641bf Upgraded Syndicate id. 2015-08-14 17:31:58 +02:00
Chinsky
617c001a62 Merge pull request #10350 from Kelenius/ofSleepersAndNano 
Of sleepers and nano
 2015-08-14 18:26:50 +03:00
Chinsky
d34599db55 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette 
Conflicts:
	code/game/objects/items/devices/uplink_items.dm
 2015-08-14 18:24:47 +03:00
PsiOmegaDelta
36d0eb0bcf Cleans up id card setup. Now with less automagic and more controlled. 2015-08-14 16:08:47 +02:00
Kelenius
aa318b8d1c Merge branch 'dev' into ofBeesAndHoney 
Conflicts:
	code/modules/materials/material_recipes.dm
 2015-08-14 16:55:21 +03:00
Kelenius
18358936ee Merge branch 'dev' into ofSleepersAndNano 
Conflicts:
	maps/exodus-1.dmm
	maps/exodus-2.dmm
	maps/exodus-5.dmm
 2015-08-14 16:50:44 +03:00
PsiOmegaDelta
bc73de33b8 Id cards are now cool when examined. 2015-08-14 15:40:39 +02:00
PsiOmegaDelta
0380d5d9d4 Completes the feature where mercenaries can setup fake crew announcements and records. 2015-08-14 13:42:11 +02:00
mwerezak
6566d88e88 Fixes bad ammo_magazine path 2015-08-14 03:48:01 -04:00
PsiOmegaDelta
02b6021277 Compilation fixes. 
It's apparently 10mm now.
 2015-08-14 08:51:06 +02:00
PsiOmegaDelta
d5c6d9c341 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-14 08:43:43 +02:00
PsiOmegaDelta
3a55b130a0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	.travis.yml
	code/modules/virus2/disease2.dm
	maps/exodus-5.dmm
 2015-08-14 08:34:42 +02:00
mwerezak
da58494275 Improves the way shrapnel clouds hit prone mobs 2015-08-14 00:25:41 -04:00
Chinsky
b01a41d766 Merge branch 'capgun' into russian_roulette 2015-08-14 06:03:33 +03:00
Chinsky
f5a59ecc9b Compile fix 2015-08-14 06:00:22 +03:00