shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,049 Commits 5 Branches 0 Tags
3524bc24eaeda23f2ba59ea2aaba6885e305ee21
Commit Graph

72 Commits

Author SHA1 Message Date
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
80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
Ghommie
c1f84da39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 12:26:17 +02:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie
a62fcdcccb forgot about the file extension. 2019-10-25 03:34:13 +02:00
Ghommie
4b0b130c36 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 00:27:04 +02:00
Ghommie
85b35433b2 Unmodularize Eutactic Blades. 2019-10-25 00:14:38 +02:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
kevinz000
3e6415d4b5 Merge pull request #9324 from Linzolle/crusher 
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
 2019-10-10 02:23:15 -07:00
lolman360
04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
skoglol
c1e84774ac one-hand shit 2019-09-20 17:28:44 -05:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Dap
f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! 2019-08-25 21:38:04 -06:00
Poojawa
23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa
2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
6c712a6931 Implementing nerfs. 2019-07-24 17:58:24 +02:00
Ghommie
b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa
971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
Useroth
7712b51fd0 Tweaks n' shit. 2019-05-17 04:49:39 +02:00
deathride58
fd000f7fb8 makes bone spears capable of reaching two whole tiles! 2018-11-30 21:41:19 -05:00
Poojawa
7d300117af literally everything Bhjin has been complaining about 
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
 2018-09-18 03:59:46 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
695bbef473 makes spears require priming to explode on throw, makes it possible to rip embedded objects out instantly by pressing resist if the item is normal sized or larger (#7450) 2018-08-23 00:30:33 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
AnturK
593919a85a Fixes fireaxe butchering. (#37850) 2018-05-16 12:04:45 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
PKPenguin321
ddb6f7ebae Esword cig lighting messages fix (#37216) 
* fix esword cig lighting message

`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`

* fix desword cig lighting message

`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`

* check fix

* desword check fix

* suggested message replacement

* suggested message change desword
 2018-04-16 19:20:26 -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
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004) 
* Replaced body zone magic strings with defines

* merge conflicts
 2018-03-19 21:18:57 -05:00
Ashe Higgs
a7d5e4cdcf Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744) 
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
 2018-02-25 14:50:29 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -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