shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,260 Commits 5 Branches 0 Tags
a728f3f5772ca2bbfdb6ff37f511eb8317f2600e
Commit Graph

139 Commits

Author SHA1 Message Date
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
Linzolle
bdd553d4f7 thanks ghom 2019-10-27 17:26:55 -05:00
Linzolle
5bafab9447 missing period 2019-10-25 16:34:32 -05:00
MMMiracles
8fb0a68feb Adds Hat Throwing (#45355) 
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
 2019-10-25 16:19:19 -05:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
Poojawa
5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up 
Adds a new traitor bundle - Synda Major Leage Player
 2019-09-21 01:56:41 -07:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
TrilbySpaceClone
626e525d24 ..? 2019-09-12 23:36:59 -04:00
TrilbySpaceClone
6a36e5a317 huh 2019-09-12 23:26:07 -04:00
TrilbySpaceClone
0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
Sishen
3f86a92efa Merge branch 'walk-like-an-egyptian' into walklikeanegyptian 2019-08-23 14:42:35 -04:00
Poojawa
96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05:00
Sishen
ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
Poojawa
088bc484e3 Forensics re-destroyed, but better this time. 
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
 2019-08-17 02:43:59 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
lolman360
0451390778 control click and then drag is easy 2019-08-11 11:16:19 +10:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
kevinz000
2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
kevinz000
d5f156925d Merge pull request #8884 from Ghommie/Ghommie-cit135 
Ports "About that beer I owed ya. Adds blueshirt items to sectech and defines them better."
 2019-07-14 03:37:36 -07:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
31bd9104bb Ports "Adds blueshirt items to sectech and defines them better." 2019-07-13 06:42:09 +02:00
kevinz000
1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125 
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
 2019-07-12 07:34:19 -07: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
Linzolle
1731d4a266 normalises hop and cap's berets to not hide hair 2019-07-07 01:44:58 -05:00
Ghommie
cb255b8719 give'r or leave'r, buddy. 2019-06-09 06:54:26 +02:00
Ghommie
7706ec6329 I LOVE THE SMELL OF NAPALM IN THE MORNING! 2019-06-09 02:45:14 +02:00
Poojawa
971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
Poojawa
69eca2ae4b progress, just need to fiddle with footprints again 2019-05-07 13:23:49 -05:00
Poojawa
105b40a4f8 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-06 02:53:42 -05:00
Trilbyspaceclone
70c5c47490 Lets not mistakenly nerf hop please? 2019-04-25 23:51:09 -04:00
Trilbyspaceclone
39fcf27beb Update jobs.dm 2019-04-25 23:48:12 -04:00
Poojawa
a772f532c3 Synthetic and RNG blood 2019-04-16 04:28:04 -05:00
Poojawa
499078fb10 Headgear is more aggressive in setting normal style stuff 
I swear byond's gotten a lot more dumb about if statements...
 2019-04-15 22:04:37 -05:00
Poojawa
fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Poojawa
7ffe49c511 Merge remote-tracking branch 'refs/remotes/origin/master' into muzzled-masks 2019-04-09 22:18:56 -05:00
Cyprian
644a5a1e66 Berettide! 2019-04-06 22:52:26 +02:00
Poojawa
fb1b76cafe compiles but I don't feel like spriting atm 2019-03-18 02:00:00 -05:00
Coolgat3
45a4693618 Update helmet.dm 2019-03-09 16:42:27 +01:00
Coolgat3
eb786cbfde Update jobs.dm 2019-03-09 16:39:51 +01:00
Coolgat3
af04b72476 Making secberets protect as much as helmets 2019-03-08 17:36:46 +01:00
deathride58
621b0675e9 Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights 2018-11-16 21:12:07 -05:00
Poojawa
4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
Poojawa
4be05e412e Fixes Fedoras having armor values (#7521) 2018-08-31 12:13:50 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -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
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00