8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
0619521418
Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
...
Corrects a few cargo crates/exports (and nerfs some)
2020-02-19 02:10:25 +01:00
e5236eebb1
hey lets do corrections
2020-02-08 17:39:00 -05:00
76219e0188
Primortial
2020-02-08 02:21:14 -05:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
530d710f57
Update mineral.dm
2020-01-09 20:42:07 -05:00
7df495f4ba
Merge branch 'master' into plastic__world
2020-01-09 20:41:33 -05:00
34c6288d22
so fantastic!
2020-01-09 05:46:30 -05:00
b4c0433d6d
more work.
2019-12-27 17:45:19 +01:00
53d142b4c0
more work.
2019-12-25 01:34:33 +01:00
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
c4450579ac
Why does breakfast have a timer?
...
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
2019-12-07 01:53:55 -05:00
05b22caaa3
Added 12 new crates, fixed issues raised in #9901
...
Remake of previous PR that I broke due to inexperiance.
Added 12 new crates to cargo.
Re-ordered some some of the crates.
2019-11-22 02:37:57 -05:00
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
6d9aa8de70
More carpet options and ways to get them
2019-10-03 22:54:10 -05:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
a6cfd22b79
Fixes gulag stacker not giving points after RPG loot event ( #38570 )
...
* Fixes gulag stacker not giving points after RPG loot event
* Moves point values to type vars
* cleanup
2018-06-21 16:30:39 -05:00
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
e582e7019e
Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay
...
Fix various bugs with telekinesis
2018-05-25 10:49:21 -05:00
fa5db57b56
Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568
...
[MIRROR] Removes enriched uranium
2018-05-02 01:26:27 +00:00
c4d461f3be
Merge pull request #37568 from pigeonsk/removeenruranium
...
Removes enriched uranium
2018-04-30 21:15:35 -05:00
07bbc4d3af
Actually links mineral sprites with their new location ( #37564 )
...
Fixes sprites being broken
2018-04-29 19:06:14 -05:00
d2885c84b7
adds grind_results to coins and diamonds ( #37403 )
2018-04-25 06:04:18 -05:00
5a532dd606
[MIRROR] Sheet icon fixes ( #5585 )
...
* Sheet icon fixes
* Update sheet_types.dm
2018-02-19 10:21:32 -06:00
e3ec8a648a
Buildable Shuttle/Plastitanium Windows ( #35376 )
...
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows
* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
2018-02-11 05:13:37 -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
4d206f56e8
Adds ~70 more suicides
2018-01-23 01:39:07 -06:00
9e0f8384e5
ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS
2018-01-17 23:51:54 -05:00
2aef00daf0
All-In-One grinder results are now defined by type, not by huge lists
2017-12-14 15:48:39 -06:00
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
2f21f16b53
initial commit - syncs and fiXES EVERYTHING WRONG ABOUT BOX HOLY FUCK HOW DID NOBODY REPORT ALL THIS SHIT
2017-11-08 17:04:20 -05:00
460fea66c8
Moves all stack object sprites from items_and_weapons.dmi to their own file
2017-10-04 11:59:53 -05:00
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
ba0e9e8e93
Alien closets now correctly cost two alloy to make ( Fixes #28561 )
2017-06-18 20:20:49 -05:00
b5d2cf3c99
[READY] Stacks will change item_states and w_class based on how full they are. ( #1370 )
2017-06-04 09:08:33 -07:00
c5b0f01dcd
Splits up mine_items.dm
2017-05-26 13:19:42 -05:00
a681b306a6
[MIRROR] Buffs plasma and nerfs snow ( #924 )
...
* Buffs plasma and nerfs snow
* Update mineral.dm
* Delete mineral.dm.rej
2017-05-18 11:13:28 -05:00
ff9928fdd7
[MIRROR] Makes it clear whether (in)complete golem shells are free or servant ( #857 )
...
* Makes it clear whether (in)complete golem shells are free or servant
* resolves rej file
2017-05-18 04:40:12 -05:00
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
faf8829d30
[MIRROR] Adamantine golem leadership ( #785 )
...
* Adamantine golem leadership
* Update stylesheet.dm
* Delete golems.dm.rej
* Delete stylesheet.dm.rej
* Update golems.dm
* fuck line endings
2017-05-08 22:16:09 -07:00
da781e0d76
Adds aesthetic basalt floor tiles
2017-05-04 06:12:26 -05:00
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -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
c997ebcabd
Removes Lag (tm) ( #313 )
...
* sensible fixes
* this too
* some more
* fixes chair icons
reverted to state before tg pull
* fixes telecomms icons
revert to state before tg pull
* fixes research icons
reverted to before tg pull
* de-whitewashed the stools
* fixed missing broadcaster sprites
* always load from the savefile
helps custom servers who don't want to fuck with the config, this will
never not be wanted with the system we have
* stop it, ghosts
* fixes limb augmentation
https://github.com/tgstation/tgstation/pull/25446
* removes lag
* re-adds sounds
* exception
* makes travis happy
2017-03-26 09:39:29 -04: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
Ghommie