shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,165 Commits 5 Branches 0 Tags
cbf041663f760d82bd39e603fd045b3db5257c74
Commit Graph

197 Commits

Author SHA1 Message Date
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
TrilbySpaceClone
54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
deathride58
d218739bf8 Merge pull request #8740 from Ghommie/Ghommie-cit87 
ports "More variety for dorms bedsheets" + 3 new bed sheets.
 2019-07-08 18:06:11 -04:00
Ghommie
fd68236594 ports "More variety for dorms bedsheets" + 3 new bed sheets. 2019-06-24 05:54:14 +02:00
Ghommie
2e30b91567 Ports in microwave updates and its radial menu. 2019-06-23 06:10:49 +02:00
kevinz000
27d7dc430f Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors 
Adds Clockwork Reflectors
 2019-06-16 19:41:57 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Trilbyspaceclone
aaaebe625b old file fixes 2019-05-31 18:00:00 -04:00
Trilbyspaceclone
3891cf1ff6 Update sheet_types.dm 2019-05-31 17:54:49 -04:00
BurgerLua
5f94441cc7 Adds Clockwork Reflectors 2019-05-30 22:52:43 -07:00
Trilbyspaceclone
070e43ca64 Update sheet_types.dm 2019-05-25 17:58:33 -04:00
Trilbyspaceclone
ed974bdcde Update sheet_types.dm 2019-05-25 17:18:40 -04:00
BurgerLua
4aba11739b Finishing touches. 2019-05-10 19:15:42 -07:00
BurgerLua
d97bf47b95 Added 2019-05-10 18:12:36 -07:00
Poojawa
d8312ec5ae Medical belt overlays + hypo storage 2019-04-04 18:38:34 -05:00
deathride58
7db87db43a fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing (#7997) 2019-02-13 21:02:00 -08:00
kevinz000
1034a6ad0e ball stuff 2018-12-16 03:41:37 -08:00
Redtail
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
Redtail
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
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes 
Also adds new buildmode
 2018-09-13 22:55:11 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04: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
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07: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
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
vuonojenmustaturska
5e48fcd275 Merge pull request #37846 from DaxDupont/axe-time 
Small cult nerf do not be alarmed robustin think about your heart
 2018-05-16 04:46:59 -05:00
LetterJay
f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
 2018-05-14 12:28:41 -05:00
CitadelStationBot
e089a8254f Merge pull request #6725 from Citadel-Station-13/upstream-merge-37731 
[MIRROR] Makes gauze deconstructable into cloth
 2018-05-13 12:19:50 -05:00
CitadelStationBot
ff8e5e92bf Update medical.dm 2018-05-13 12:01:55 -05:00
FrozenGuy5
e9ef82513c Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464) 
* Update smelting_designs.dm

* Tweaks material values on titanium glass.

* Optimizes math & fixes errors and inconsistencies
 2018-05-13 06:13:36 -05:00
Mickyan
b11e600cff Makes gauze deconstructable into cloth 2018-05-12 19:15:32 -05:00
Tad Hardesty
021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -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
LetterJay
154ab5022b Merge pull request #6576 from Citadel-Station-13/upstream-merge-37564 
[MIRROR] Actually links mineral sprites with their new location
 2018-04-30 22:34:53 -05:00
Jordan Brown
c4d461f3be Merge pull request #37568 from pigeonsk/removeenruranium 
Removes enriched uranium
 2018-04-30 21:15:35 -05:00
Jalleo
987cce76ed [s] Small tweaks and fixes a edgecase with machine construction (#37494) 
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
 2018-04-30 05:00:24 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -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
oranges
74a483d350 Merge pull request #37497 from ExcessiveUseOfCobblestone/patch-42 
Replaces a / with * as per Contributing.md [bscrystal.dm]
 2018-04-27 21:21:59 -05:00
deathride58
13c28b9ff1 Merge pull request #6513 from Citadel-Station-13/upstream-merge-37403 
[MIRROR] Adds grind_results to coins and diamonds
 2018-04-27 09:34:49 +00:00
81Denton
d2885c84b7 adds grind_results to coins and diamonds (#37403) 2018-04-25 06:04:18 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
deathride58
5669e6a0a1 Merge branch 'master' into upstream-merge-36953 2018-04-10 07:21:55 +00:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
deathride58
e54029a382 Update stack.dm 2018-04-06 20:51:39 -04:00