c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
f07a9c13fb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-03-02 01:44:58 -08:00
123de14009
upload files
2021-02-18 15:05:39 -03:00
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
d1277ad7b2
Updated auxmos (see desc)
...
1. All callbacks are now auxmos-side, using new auxcallbacks.
2. Heat processing is now paused for and has been optimized by making it have fewer callbacks.
2020-12-10 12:03:28 -08:00
98703e6ad6
Merge remote-tracking branch 'upstream/master' into arcade-carpets
2020-10-01 13:41:10 -05:00
643421bc23
adds arcade carpets
...
yay
2020-09-28 14:43:03 -05:00
b97b595f6f
Three new wooden floor types
2020-09-26 18:29:46 -04:00
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
13c9954f74
fix
2020-08-07 17:00:27 -07:00
76b5557e1e
bunch of grammar corrections
2020-06-27 02:12:44 +01:00
6db076c42f
Lowers the slowdown on snow tiles ( #12404 )
...
* Update fancy_floor.dm
* Update fancy_floor.dm
2020-06-04 15:52:30 -07:00
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
60134ea8ae
[s] Fixes singularity pulls duping rods out of engine floors.
2019-12-25 03:34:42 +01:00
e2f9a68c2c
Merge pull request #10049 from Useroth/new-tg-plants
...
Colored fairy grass, because fuck your eyes.
2019-12-05 21:43:24 -07:00
b9ce4a8622
Oopsie
2019-12-05 01:49:55 +01:00
950b884da5
Adds colored fairygrass.
2019-12-05 01:47:42 +01:00
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
2ced7db508
Ported a bunch of tg hydroponic stuff.
2019-11-21 10:53:57 +01:00
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
641ddebed1
Ports "Uses defines for turf atmos"
2019-11-17 03:19:35 +01:00
6d9aa8de70
More carpet options and ways to get them
2019-10-03 22:54:10 -05:00
2a4a656a4d
Port new footsteps from tg
2019-05-17 18:10:03 -05:00
629189fdc1
Added Another new carpet, and two tables, and a new cargo crate.
...
Added: monochrome. Two new table sprites for the other new carpet. New cargo supply crate for the two new carpets. Changed: the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
2018-12-07 22:48:46 -06:00
e339bcd2ca
Added a new carpet
...
Worked on adding a new carpet. It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
2018-12-01 20:21:18 -06:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
d875c362fa
[MIRROR] Turf grammar omnibus ( #7104 )
...
* Turf grammar omnibus (#38375 )
* Fix plurality and propriety on turfs
Some turfs are marked tentatively plural in order to avoid an incorrect
choice of "a" or "an".
* Add an article var to handle unusual a/an
* An additional pass on turf names
* Decapitalize server, mainframe, killroom floors
* Turf grammar omnibus
2018-06-13 19:31:29 -07:00
a9d452a24d
Merge pull request #37549 from ShizCalev/bounce_away-fixes
...
Resolved var name conflict for bounce_away()
2018-04-30 12:51:40 -05:00
5ea2e57419
Merge pull request #35629 from ShizCalev/floor-tool_acts
...
Converts floor tool interactions to tool_act, fixes flooring exploits
2018-02-16 06:07:19 -06:00
72ff7be9bd
code folder. 221 files changed wew
2018-02-12 21:03:40 -05:00
717da969a6
[MIRROR] Var cleanup and map fixes ( #5359 )
...
* Merge pull request #35429 from ShizCalev/snowdin-cleanup
Var cleanup and map fixes
* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
7126b61205
[MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag ( #5327 )
...
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag
* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
25cf971fef
Merge pull request #31275 from kingofkosmos/moredeconhints
...
Adds deconstruction hints to various things
2017-10-04 16:33:51 -05:00
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
df815e99bd
Lavaland's default atmos is now a define
2017-06-21 08:32:00 -05:00
4f9c8a0869
Luxury Bluespace Shelter Capsules, Take 2.
2017-05-30 17:05:54 -05:00
a1ebd8c791
Refactors how diagonal smoothing underlays work ( #1187 )
2017-05-27 13:40:09 -07:00
6617f68604
[MIRROR] Harvesters are more fun to play ( #894 )
...
* Harvesters are more fun to play
* resolve .rej
2017-05-18 07:12:29 -05:00
da781e0d76
Adds aesthetic basalt floor tiles
2017-05-04 06:12:26 -05: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
SandPoot