shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

69 Commits

Author SHA1 Message Date
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
Ghommie
6fe0c57c42 run-extra-times fixes. 2020-01-24 20:48:32 +01: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
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08: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
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
kevinz000
47c92e380c Merge branch 'master' into throwing_disarm_stuff 2019-12-30 00:05:17 -08:00
Ghommie
9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
kevinz000
5cbcc06497 Update objs.dm 2019-12-08 22:04:32 -07: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
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Ghommie
d2e216f2de tested fixed tested fixed tested. 2019-06-09 19:55:08 +02:00
Ghommie
480ee9a9da Reskinnable PDAs. 2019-06-08 19:55:47 +02:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
vuonojenmustaturska
417496aa6e Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects (#38934) 
* Wrap setting anchored for structures, fix atmos bug

* forgot this

* Add a signal for setanchored

* move setanchored to obj

* machinery, also some structure stuff

* tabbing
 2018-07-06 13:28:01 -05:00
LetterJay
74f7e56f4e Merge pull request #7284 from Citadel-Station-13/upstream-merge-38797 
[MIRROR] Fixes TGUI runtime
 2018-07-01 09:41:03 -05:00
ShizCalev
8c410b92a7 Fixes TGUI runtime (#38797) 
ui_interact was being called on usr instead of M
 2018-07-01 05:44:17 -05:00
Tad Hardesty
83a4003660 Move throwforce up to atom/movable (#38689) 2018-06-26 15:27:09 -05:00
AnturK
5e156e7a07 Fixes AI's being unable to call shuttle using comm console. (#38534) 
* Fixes AI's being unable to call shuttle using comm console.

* Lets get rid of double negatives

* viewvers for
 2018-06-20 19:39:17 -05:00
CitadelStationBot
ae9c3f4b83 [MIRROR] You can see what other people eat or drink (#7101) 
* You can see what other people eat or drink (#38395)

* Makes drinking message visible to others

* Makes swallow message visible to other people

* Adds visible messages for eating

* Update snacks.dm

* Update snacks.dm

* Update objs.dm

* Update drinkingglass.dm

* Update pen.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinks.dm

* Update condiment.dm

* Update snacks.dm

* Adds a few extra reagents to the borg shaker

* Update drinkingglass.dm

* Update drinkingglass.dm

* removes blood as a borg shaker reagent

* You can see what other people eat or drink
 2018-06-13 20:31:38 -07:00
vuonojenmustaturska
f373b2c9e6 Kills off three more flags from flags_2 2018-04-29 17:30:55 -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
ACCount
f0cf4ad29d [READY] NTNet airlocks 2018-03-08 22:42:46 -06:00
CitadelStationBot
1f0a456085 [MIRROR] Reskinning objects now shows the possible appearances in chat (#5680) 
* Reskinning now shows options in chat (#35910)

* Reskinning objects now shows the possible appearances in chat
 2018-02-24 06:05:18 -06:00
CitadelStationBot
af2ae3d727 [MIRROR] Reverts intercept_user_move change for flightsuits (#5630) 
* Merge pull request #35830 from vuonojenmustaturska/clientsignal

Reverts intercept_user_move change for flightsuits

* Reverts intercept_user_move change for flightsuits
 2018-02-21 09:28:53 -06:00
vuonojenmustaturska
6dfa89fab7 Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679) 
* honk

* qdel memes
 2018-02-16 00:41:04 -06:00
oranges
5dc3549801 Merge pull request #35542 from ShizCalev/free-spam-removal 
Cleans up some duplicate canusetopic warnings
 2018-02-15 20:35:03 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817) 
Pulling claw is integrated circuit,which allows drones to pull things.
 2018-01-11 14:03:52 -06:00
ShizCalev
6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
oranges
a637da3b0f Add the ability to osay from the viewvar dropdown (#32804) 2017-11-17 03:49:08 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
kevinz000
77d6420db0 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes 2017-10-13 19:09:45 -05:00
XDTM
5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -05:00
Leo
39cf9bb7a0 Merge pull request #31286 from KorPhaeron/ismachinery 
ismachinery define
 2017-10-04 19:26:38 -05:00
CitadelStationBot
ccd55bb779 [MIRROR] Remove /obj/proc/gang_contraband_value (#2799) 
* Remove /obj/proc/gang_contraband_value() (#30744)

unused

* Remove /obj/proc/gang_contraband_value
 2017-09-16 04:31:22 -05:00
LetterJay
935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
Jordan Brown
92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -05:00
ExcessiveUseOfCobblestone
33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
kevinz000
301a581e64 sync 2017-08-29 09:41:11 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
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