shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,993 Commits 5 Branches 0 Tags
ddcfcb5cd8fe7bbb8361c2a541cd1908add46296
Commit Graph

103 Commits

Author SHA1 Message Date
Ghom
609eb190e0 Update area_copy.dm 2020-04-13 03:29:07 +02:00
kevinz000
e962afedfa Merge pull request #11825 from Ghommie/Ghommie-cit674 
Little Holodeck refactor.
 2020-04-12 17:03:11 -07:00
Ghommie
983f369357 Little Holodeck refactor. 2020-04-12 01:49:25 +02:00
Ghommie
7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
94db06509c slight desword reflect meme buff 2020-03-16 03:50:26 -07:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
kevinz000
d376b99af6 Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2 
Fixing a little issue with the Holodeck's Kobayashi Maru phaser
 2020-03-06 00:19:51 -07:00
Ghom
beef891789 Update area_copy.dm 2020-03-03 15:12:54 +01:00
Ghom
490ad4373d Update area_copy.dm 2020-03-03 15:12:06 +01:00
Ghom
edc53770ea Update area_copy.dm 2020-03-03 15:05:32 +01:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Seris02
a100f9382e better, there, happy now github 2020-01-20 14:51:53 +08:00
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2020-01-03 00:01:54 +00:00
Ghommie
8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +01:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
a2f9aaf899 Porting "Adjacent Atmos subsystem revival" 2019-10-28 17:04:31 +01:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
kevinz000
5cf627e889 Update computer.dm 2019-10-11 20:43:36 -07:00
kevinz000
e600b59217 Update computer.dm 2019-10-11 20:42:01 -07:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Poojawa
017a3111ec Yeah this is a much, much better way of doing it. 2019-08-15 08:37:10 -05:00
Poojawa
f76bb27127 Fixes some runtimes and removes a holodeck exploit 
and a cleanup >.>;
 2019-08-08 21:33:42 -05:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
kevinz000
cf3e7d42a6 shit we don't have 2018-12-16 03:45:15 -08:00
kevinz000
1034a6ad0e ball stuff 2018-12-16 03:41:37 -08:00
Poojawa
c836a7e5ea Cleans up map errors 
Knowing my fucking luck it ain't all of 'em
 2018-09-20 04:28:02 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
CitadelStationBot
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
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -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
vuonojenmustaturska
0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
Jordan Brown
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
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