7a6796eb76
Merge pull request #34620 from ShizCalev/color-correction
...
Corrects tile color defines
2018-01-19 12:24:00 -06:00
757dfbbdc5
Ports Aurora's floor tile color turf decals (For mappers) ( #34492 )
...
* ports Aurora's floor tile color decals
* replaces aurora's decals with new ones that actually have detail, renames turf_decal/corner to turf_decal/tile
* corner > tile decal
2018-01-18 21:28:14 -06:00
e4410a3320
Merge branch 'master' into mapsyncs43293845982
2018-01-08 06:18:11 +00:00
801eab4c3c
Fixes decals being created on bad turfs ( #34121 )
...
* Fixes decals being created on bad turfs
* Fix decal check
* squash me daddy
2018-01-07 18:51:09 -06:00
d2ec28b1e6
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
505fc95ad0
Merge pull request #34034 from deathride58/goonstylecrayons
...
Makes crayons draw at the location you click
2018-01-05 09:28:07 -06:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
269208f687
[READY]Component Forensics and Item Blood OverlayS!
2017-12-27 15:19:14 -06:00
1b6b8a7c00
Update cleanable.dm
2017-12-19 17:46:15 -06:00
0a05b499fd
Update cleanable.dm
2017-12-19 17:14:57 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
ddbb5c34d4
manual mirrors
2017-11-21 14:06:28 -05:00
e8ddae5d98
Cleans up floors.dmi a bit and adds new turf decals.
2017-11-20 20:48:06 -06:00
41b60c6d1e
Merge pull request #3845 from Citadel-Station-13/upstream-merge-32441
...
[MIRROR] Crayon rotation as a type var
2017-11-09 03:18:17 -06:00
a297f4bc7f
Update crayon.dm
2017-11-08 02:22:48 -06:00
88e7e8d2cb
Fixes turf_decal layering
2017-11-07 21:38:53 -06:00
5bcaf7a3b1
Crayon rotation as a type var
2017-11-07 08:03:32 -06:00
a9f07518a7
Shuttle rotation refactor and significant performance upgrade
2017-10-31 20:23:57 -05:00
927dea03ce
Fixes excessive overlay churn ( #32065 )
...
* Fixes excessive overlay chern
Adding an overlay on every cross and uncross of every player (with how bloody the station gets this is called on just about every fucking movement, some times multiple times if there are multiple types of stains (oil, blood, alien, etc) is an excessive as fuck amount of chern in the overlay subsystem.
This is likely the cause of overlays being so high.
* I APOLOGIZE FOR NOTHING!
2017-10-25 21:45:46 -05:00
c1bd7bc6ba
Map syncs 1 - Code syncs
2017-10-23 12:56:26 -04:00
28656d3347
Merge pull request #31809 from ShizCalev/helper-cleanup
...
Cleans up some istypes not using helpers
2017-10-17 19:21:14 -05:00
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
7a0ce217db
Refactors virus spreading
2017-10-09 08:55:57 -05:00
2b42ad5200
Update decal.dm
2017-10-06 22:22:35 -05:00
0dc8bd5d83
Sets turf decal layer
2017-10-06 03:12:07 -05:00
e4db027692
[MIRROR] Fixes to more Initialize procs ( #2733 )
...
* Fixes to more Initialize procs
* Update ai_monitored.dm
* Update cleanable.dm
* Update instruments.dm
* Update musician.dm
* Update noticeboard.dm
* Update mimic.dm
* Update interactive.dm
2017-09-13 22:54:12 -05:00
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
bbcad2fa58
Proper mirror PR for the disease refactor because I fucked up the first one. ( #2026 )
...
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025 )"
This reverts commit 44742cb115
2017-07-31 23:41:22 -07:00
0f23a00e40
Cleaned up some turf decals, fixed beach away mission ( #2152 )
2017-07-26 22:56:55 -07:00
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
813bcc2b8d
commit
2017-06-14 11:16:54 -05:00
1658e48bc1
[READY] Gang Points Refactor - Now stored in the gang datum
2017-06-08 14:46:07 -05:00
ab50a3eca5
Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283
...
[MIRROR] Decentralized and Vastly Improved Gang Influence System
2017-05-22 16:28:57 -05:00
c39b60b3cf
Decentralized and Vastly Improved Gang Influence System
2017-05-20 18:37:48 -05:00
a430e24555
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-18 16:38:09 -05:00
9dcac046ef
WHOSE FOOTPRINTS ARE THESE
2017-05-13 18:01:40 -05:00
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
4f4390fe01
Renames the Cleanable/ folder to cleanable/ ( #396 )
2017-04-15 14:48:29 -04:00
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
f67e9f6d87
Bleeding edgy refresh ( #303 )
...
* not code stuff
* other things
* global vars, defines, helpers
* onclick hud stuff, orphans, world.dm
* controllers and datums
* game folder
* everything not client/mobs in modules
* client folder
* stage 1 mob stuff
* simple animal things
* silicons
* carbon things
* ayylmaos and monkeys
* hyoomahn
* icons n shit
* sprite fixes
* compile fixes
* some fixes I cherrypicked.
* qdel fixes
* forgot brain refractors
2017-03-21 11:44:10 -05:00
Jordan Brown