shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,805 Commits 5 Branches 0 Tags
b0940456f5fd7629f8d15a15d94de4a38b3dccb5
Commit Graph

65 Commits

Author SHA1 Message Date
CuteMoff
dd295d20c2 Merge branch 'master' into Plasmaispogtake2 2021-03-25 10:44:12 -04:00
CuteMoff
3efce37fd9 Update mineral.dm 2021-03-25 10:32:13 -04:00
CuteMoff
ea200acd9f Update code/game/objects/items/stacks/sheets/mineral.dm 
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2021-03-23 23:17:24 -04:00
CuteMoff
a51a1ae68f Update mineral.dm 2021-03-23 21:24:11 -04:00
CuteMoff
048b8548ad Update mineral.dm 2021-03-23 20:53:07 -04:00
CuteMoff
428591c452 Update mineral.dm 2021-03-23 20:36:48 -04:00
lolman360
8f5078a15a Update mineral.dm 2020-08-18 14:47:47 +10:00
lolman360
bb86003510 w e w 2020-08-18 10:04:52 +10:00
Ghommie
cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02:00
Ghommie
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
Ghom
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
TrilbySpaceClone
e5236eebb1 hey lets do corrections 2020-02-08 17:39:00 -05:00
TrilbySpaceClone
76219e0188 Primortial 2020-02-08 02:21:14 -05:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Trilbyspaceclone
530d710f57 Update mineral.dm 2020-01-09 20:42:07 -05:00
Trilbyspaceclone
7df495f4ba Merge branch 'master' into plastic__world 2020-01-09 20:41:33 -05:00
TrilbySpaceClone
34c6288d22 so fantastic! 2020-01-09 05:46:30 -05:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghommie
53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Trilbyspaceclone
0f5c8db456 Merge branch 'master' into donut 2019-12-17 15:12:51 -05:00
TrilbySpaceClone
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
Winter Flare
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
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Poojawa
6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
YPOQ
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
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
Jordan Brown
e582e7019e Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay 
Fix various bugs with telekinesis
 2018-05-25 10:49:21 -05:00
deathride58
fa5db57b56 Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568 
[MIRROR] Removes enriched uranium
 2018-05-02 01:26:27 +00:00
Jordan Brown
c4d461f3be Merge pull request #37568 from pigeonsk/removeenruranium 
Removes enriched uranium
 2018-04-30 21:15:35 -05:00
pigeons
07bbc4d3af Actually links mineral sprites with their new location (#37564) 
Fixes sprites being broken
 2018-04-29 19:06:14 -05:00
81Denton
d2885c84b7 adds grind_results to coins and diamonds (#37403) 2018-04-25 06:04:18 -05:00
CitadelStationBot
5a532dd606 [MIRROR] Sheet icon fixes (#5585) 
* Sheet icon fixes

* Update sheet_types.dm
 2018-02-19 10:21:32 -06:00
uraniummeltdown
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
CitadelStationBot
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
MrDoomBringer
4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
Ashe Higgs
2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
CitadelStationBot
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
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58
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
bawhoppen
460fea66c8 Moves all stack object sprites from items_and_weapons.dmi to their own file 2017-10-04 11:59:53 -05:00
kevinz000
3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot
ba0e9e8e93 Alien closets now correctly cost two alloy to make (Fixes #28561) 2017-06-18 20:20:49 -05:00