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

84 Commits

Author SHA1 Message Date
Hatterhat
0f5ea361e7 bada bing bada boom 2020-02-15 14:07:35 -06:00
ShadeAware
c46c683664 FIXES FANCY SWITCHBLADES 
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
 2020-01-31 21:12:08 -05:00
Arturlang
d26ca9dbf0 Fixes this 2020-01-31 13:57:30 +01:00
Ghom
1caa2af4cf Update weaponry.dm 2020-01-30 04:05:35 +01:00
Ghom
793cc26ddc Update weaponry.dm 2020-01-30 03:28:47 +01:00
Ghom
096d9e01e1 Update weaponry.dm 2020-01-30 03:19:04 +01:00
Ghom
b2ca380a13 Update weaponry.dm 2020-01-30 03:15:24 +01:00
ShadeAware
92398ae354 Why am I having such trouble with a fucking SPAN CLASS 2020-01-26 19:46:30 -05:00
ShadeAware
f7373ae40d WHY DID THE INDENTATION NOT SHOW IT WAS FUCKED UP BEFORE 
WEBEDIT CHANGE WEBEDIT CHANGE REEEEEEEEEEEEEE
 2020-01-26 19:42:21 -05:00
ShadeAware
fffea32a59 Lets the user know they improved their switchblade. 
Confusion is bad. Lets make it not confusing.
 2020-01-26 19:26:58 -05:00
ShadeAware
2cd6ed5f26 REEEE STRAY SLASHES 
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
 2020-01-26 16:31:00 -05:00
ShadeAware
732dd8a3bb Hmm, today I will forget quotes on my strings. 
Thank you Putnam.
 2020-01-26 16:11:22 -05:00
ShadeAware
e75807430b Adds Makeshift Sprites and Fancy Sprites; Fancy Crafting 
Not actually crafting but you get the idea. This won't compile haha.
 2020-01-26 15:53:37 -05:00
ShadeAware
f547c8692b Changes all references of "Makeshift" to "Crafted" because im not willing to change the switchblade's fucking SEXY SPRITE 
YOU CAN'T MAKE ME DO IT GHOMMIE, THAT IS SOMETHING I WILL NOT COMPROMISE ON.
 2020-01-23 16:40:30 -05:00
Ghom
51812ae0ec Proud? No. 2020-01-23 16:33:11 +01:00
ShadeAware
fd04469ff0 H 2020-01-23 08:01:28 -05:00
ShadeAware
0b1a0e7286 Update weaponry.dm 2020-01-22 17:54:27 -05:00
ShadeAware
1c4f37b5bf MAKING THE CODE LESS SHIT THANS TO ARTUR AND SUN WUKONG 
WHY DID IT TAKE ME SO LONG TO DO THIS THEY LITERALLY SPOONFED ME THE INFORMATION GOD IM SO FUCKING STUPID AND RETARD GOD I FUCKING I FHUHDHJUGDFJTUFUGFUG7F7BGFJKDOKDIVFUBHFB
 2020-01-22 17:50:57 -05:00
ShadeAware
08016a8461 Ghommie commands, I obey. 2020-01-20 20:22:09 -05:00
ShadeAware
9f488c80a1 Update weaponry.dm 2020-01-20 18:49:04 -05:00
ShadeAware
6f243f9c44 Update weaponry.dm 2020-01-20 18:08:05 -05:00
ShadeAware
ffef7cd4db Update weaponry.dm 2020-01-20 17:33:18 -05:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Trilbyspaceclone
c575b3c798 base ball bats, katanan's and chainsaws will still fit 2019-11-17 13:54:18 -05:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
lolman360
04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
Trilbyspaceclone
a751a73113 Apply suggestions from code review 
thx Ceb

Co-Authored-By: cebutris <cebutris2000@gmail.com>
 2019-09-10 18:52:49 -04:00
TrilbySpaceClone
0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
kevinz000
87cf0b971a Merge pull request #9221 from Sishen1542/chappy 
adds some new nullrods with some back end null rod refactors
 2019-09-06 16:47:46 -07:00
Sishen
d431ee1a20 baseball bat 2019-09-04 03:01:47 -04:00
nik707
2fe5571887 Merge pull request #9212 from dapnee/plasmaglass-tables-spears 
Plasmaglass Tables, Spears, Shards (Take 2)
 2019-09-02 18:37:22 -05:00
Trilbyspaceclone
6cf4783486 fixed 2019-08-27 13:56:47 -04:00
Dap
f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! 2019-08-25 21:38:04 -06:00
Ghommie
12f2b767ab removes stamina-free spammability. 2019-07-19 21:23:07 +02:00
Ghommie
b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
Useroth
7712b51fd0 Tweaks n' shit. 2019-05-17 04:49:39 +02:00
Trilbyspaceclone
4fb335ec87 shift key must be broken or something 2019-03-21 19:57:22 -04:00
Trilbyspaceclone
b0835cd94b Update weaponry.dm 2019-03-21 19:42:57 -04:00
Trilbyspaceclone
8db007bffe Update weaponry.dm 2019-03-21 19:40:41 -04:00
Trilbyspaceclone
b0a9bab300 Buffs Highlander stam 2018-11-24 00:09:41 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
4f36f3d263 Merge pull request #6945 from ElPresidentePoole/master 
Allows players to commit seppuku with any katana, adds SFX for seppuku
 2018-08-17 16:55:28 -04:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04: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
El Presidente P
e4c63ac25a Allows players to commit seppuku with any katana, adds slash SFX to 
katana suicide
 2018-05-28 19:07:11 -04:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00