shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,291 Commits 5 Branches 0 Tags
71e7b461d52982ace4e0c19e2188ecbf11b1988e
Commit Graph

10269 Commits

Author SHA1 Message Date
LetterJay
7074b28401 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-02-27 16:29:50 -06:00
LetterJay
586021483e no click! 2017-02-27 16:29:28 -06:00
TalkingCactus
2cf17f19df New Icons (#249) 
* mech fab

* intercoms

* SMES + APC

* autolathe + pipedisp

* light tubes, light fixtures

* microwave + food processor

* detective revolver

* new laser gun

* R&D machines

* all tcomms machinery

not included: AAS

* new chairs+stools

* cameras + air alarms

* revolver and laser carbine
 2017-02-27 15:30:12 -05:00
LetterJay
da5d98f099 Merge pull request #248 from LetterJay/master 
Changes discord back to IRC - job tweaks
 2017-02-26 15:15:58 -05:00
LetterJay
672bdb5eea Update update_icons.dm 2017-02-26 13:36:43 -06:00
LetterJay
640954498f move everything back to irc 2017-02-26 13:29:18 -06:00
TalkingCactus
be40ffe334 usr << to O.visible_message() (#246) 2017-02-25 12:06:51 -05:00
TalkingCactus
7e75b904ef fixes runtime (#245) 2017-02-25 09:06:45 -05:00
TalkingCactus
36c580c236 The Update (#241) 
* auto vote runtime error fix

* part 1

* adds a wolf pai sprite

modified fox sprite that doesn't make your eyes bleed

* missed a painful sprite

* part 2

* ptwhatever

* save

* conflict resolution pt1

* conflict resolution pt2

* almost done with the preferences shit

* fixes missing arousal HUD

* file rename

* even more

* keep the panic commits coming

* forgot one

* wew, gonna go make some small changes

* s o o n

* LOOC admin and player toggles

* fixed backpacks and taurs clipping on the preview

* fixed penis length saving

* typo fix

* arousal fix

* icon tuning

* final
 2017-02-24 21:42:15 -05:00
Poojawa
82fe4b01be EMP-proof PA (#239) 2017-02-20 01:06:03 -05:00
TalkingCactus
bd13d677d4 Sweater Weather (#236) 
* adds 5 new sweaters

cream blue green purple red

* fuck this didn't go through

* done

* WAIT

* Rename sweaters.dm to cit_uniforms.dm

* .dme fix

* 42
 2017-02-20 01:05:49 -05:00
TalkingCactus
2ecae386bb Wolf pAI Chassis (#237) 
* wolf pai chassis

* sprite tweak
 2017-02-20 01:05:32 -05:00
Roland Forgo
dd916684ad Adds an autoimplanter to research designs, quite high tech and material needs come with it. (#216) 2017-02-18 04:15:39 -05:00
TalkingCactus
0453438a7a Several Balance and Convenience Changes (#235) 
* swarmers slowed down

* drones slowed down so they're controllable again

* cake hat force reduced to 6 from 15

* welding tool balance changes
 2017-02-18 04:00:27 -05:00
LetterJay
ee42eab64f Merge pull request #234 from LetterJay/master 
fix character switching bug
 2017-02-17 15:47:53 -05:00
LetterJay
8066422c75 fix character switching bug 2017-02-17 14:43:06 -06:00
LetterJay
8af261f46c Merge pull request #233 from LetterJay/master 
fixes jetpack not having a sprite after being upgraded
 2017-02-17 09:24:20 -05:00
LetterJay
1ce5fe2bd8 fixes jetpack not having a sprite after being upgraded 2017-02-17 00:07:11 -06:00
TaxMaster
a5e688b25d Adds Kinkmate back into the server (#231) 
* Adds in clothing from the /vg/ rip

* adds clothing from the /vg/ rip

* Adds in the kinkmate back in.

Its fairly barebones at the moment, cause dildo/onahole code is getting
ported.

Shoutouts to Cactus for literally giving me the code over discord.

* a

a

* Fixed stuff

Made the vending code more in-line with the citadel master and fixed the
gitignore.

* Fixes up the vending_items

Also adds dog collars to the contraband section to the kinkmate.

* A learning experience

Why did TG making map coding so difficult, anyway?

* aaaaaa

I hate life sometimes.
 2017-02-16 19:59:45 -05:00
LetterJay
51a8dfe5db Merge pull request #232 from LetterJay/master 
Splashscreen fix, shuttle tweak, flight suits gone for now
 2017-02-16 09:41:38 -05:00
LetterJay
7c7b81e3b8 removes flightsuit from fab 2017-02-16 08:34:24 -06:00
Poojawa
fc2dbcd9fe Tg port 2 15 (#230) 
* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings
 2017-02-15 03:35:32 -06:00
LetterJay
fd3923d684 Antag fix (#228) 
* shuttle tweak, splashscreen fix

* adds a martyr check for escaping
 2017-02-15 01:44:23 -06:00
LetterJay
412701b864 shuttle tweak, splashscreen fix (#227) 2017-02-15 01:44:00 -06:00
TaxMaster
abc3edb45c Add vg clothing to the vending machines (#221) 
* Adds in clothing from the /vg/ rip

* adds clothing from the /vg/ rip

* Update machines to add VG clothing

Now with better tabulation and grouping!

* Update vending machines to have VG clothing

"TalkingCactus: it's the fact that it's 100x easier to read when it's vertical"
 2017-02-15 01:43:45 -06:00
LetterJay
709490308e adds a martyr check for escaping 2017-02-14 05:31:25 -06:00
LetterJay
06eb1517c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-02-14 04:52:59 -06:00
LetterJay
3f3f5c3242 shuttle tweak, splashscreen fix 2017-02-14 04:49:47 -06:00
Poojawa
84350d3417 fixes travis' shit (#226) 2017-02-14 04:28:51 -06:00
LetterJay
e649b81cc1 adds tongues to alien butcher loot tale 2017-02-13 09:00:43 -06:00
LetterJay
8bf89d880f slime/jelly are immune to stepping on glass shards 2017-02-13 06:19:26 -06:00
Poojawa
e7e9f69ac6 how am formatting?? (#223) 
* AAAAAAAAAAAAAAAAAAAAA

* Formatting is dumb

* Update adminhelp.dm

* I'm going to port yog's tickets I think

* wew lads, doubling has been fixed.

* also some quick fixes from TG
 2017-02-12 22:40:18 -06:00
Poojawa
1d1b69bd4e AAAAAAAAAAAAAAAAAAAAA (#222) 2017-02-12 21:19:17 -06:00
Poojawa
eee427f4b4 magboot hotfix (#218) 2017-02-12 08:48:24 -06:00
Poojawa
00436e7495 Gibber and fixes (#217) 
* citadel memes and cryopod icon fix

* tailwag fix
 2017-02-12 07:55:49 -06:00
Poojawa
6674f9fc15 Tg 2 11 sync (#215) 
* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes
 2017-02-12 03:56:14 -06:00
TalkingCactus
30b3dff395 Adds Maintenance Bar+ (#212) 2017-02-12 04:52:15 -05:00
TaxMaster
6a4c8eb493 Port VGs clothing to the server. (#213) 
* Add files via upload

* Add files via upload

* Update glasses.dm

* Update miscellaneous.dm

* Update miscellaneous.dm

* Update helmet.dm

* Update misc.dm

* Update magboots.dm

* Update miscellaneous.dm

* Update colour.dm

* Update hardsuit.dm

* Update miscellaneous.dm

* Update armor.dm

* Update miscellaneous.dm

* Update miscellaneous.dm

* Update security.dm
 2017-02-12 03:49:26 -06:00
Poojawa
449614df96 Actually cleans up un-needed files. (#210) 
* actually gets rid of excess files

* obsolete admin files
 2017-02-08 22:35:56 -06:00
LetterJay
b2a4de328b sql_message_system.dm update 2017-02-08 19:24:09 -06:00
LetterJay
af068d8ff4 shuttle autocall @ 3 hours 2017-02-08 07:37:57 -06:00
Poojawa
dfb3df1583 reverts save file version bullshit 2017-02-08 00:54:48 -06:00
Poojawa
3f8df133d8 other things I missed 2017-02-08 00:49:31 -06:00
Poojawa
d0f50d5488 other things I missed. oops 2017-02-08 00:38:26 -06:00
Poojawa
883ebad540 mob fixes 2017-02-08 00:27:04 -06:00
Poojawa
68bad60a1c admin modules 2017-02-08 00:17:48 -06:00
Poojawa
f49c0c0268 some modules things 2017-02-08 00:06:03 -06:00
Poojawa
01ed369034 game folder 2017-02-08 00:02:05 -06:00
Poojawa
f6dfa820fd onclick and datums 2017-02-07 23:55:43 -06:00
Poojawa
06e49c2df3 define things and soapstone strings 2017-02-07 23:52:33 -06:00