ee42eab64f
Merge pull request #234 from LetterJay/master
...
fix character switching bug
2017-02-17 15:47:53 -05:00
8066422c75
fix character switching bug
2017-02-17 14:43:06 -06:00
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
1ce5fe2bd8
fixes jetpack not having a sprite after being upgraded
2017-02-17 00:07:11 -06:00
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
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
7c7b81e3b8
removes flightsuit from fab
2017-02-16 08:34:24 -06:00
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
fd3923d684
Antag fix ( #228 )
...
* shuttle tweak, splashscreen fix
* adds a martyr check for escaping
2017-02-15 01:44:23 -06:00
412701b864
shuttle tweak, splashscreen fix ( #227 )
2017-02-15 01:44:00 -06:00
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
709490308e
adds a martyr check for escaping
2017-02-14 05:31:25 -06:00
06eb1517c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-02-14 04:52:59 -06:00
3f3f5c3242
shuttle tweak, splashscreen fix
2017-02-14 04:49:47 -06:00
84350d3417
fixes travis' shit ( #226 )
2017-02-14 04:28:51 -06:00
06e7edcb4a
Merge pull request #224 from LetterJay/master
...
Slime/Jelly people are immune when stepping on glass shards
2017-02-14 02:33:55 -05:00
3750d0260f
Merge pull request #225 from LetterJay/aliens
...
Adds alien tongues to butcher
2017-02-14 02:33:46 -05:00
e649b81cc1
adds tongues to alien butcher loot tale
2017-02-13 09:00:43 -06:00
c71f9dac06
cleanup
2017-02-13 06:42:30 -06:00
1cc9e33c08
Delete Empty.txt
2017-02-13 06:20:28 -06:00
8bf89d880f
slime/jelly are immune to stepping on glass shards
2017-02-13 06:19:26 -06:00
e7c792e2c6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-02-12 22:43:33 -06:00
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
1d1b69bd4e
AAAAAAAAAAAAAAAAAAAAA ( #222 )
2017-02-12 21:19:17 -06:00
e1ca343edd
Update .travis.yml
2017-02-12 09:19:03 -06:00
d2aa5dd6cf
Update .travis.yml
2017-02-12 09:12:14 -06:00
62e45a860e
testing
2017-02-12 08:56:29 -06:00
eee427f4b4
magboot hotfix ( #218 )
2017-02-12 08:48:24 -06:00
00436e7495
Gibber and fixes ( #217 )
...
* citadel memes and cryopod icon fix
* tailwag fix
2017-02-12 07:55:49 -06:00
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
30b3dff395
Adds Maintenance Bar+ ( #212 )
2017-02-12 04:52:15 -05:00
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
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
513d98f724
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-02-08 19:24:54 -06:00
b2a4de328b
sql_message_system.dm update
2017-02-08 19:24:09 -06:00
b340a87ebc
Merge pull request #209 from LetterJay/master
...
shuttle autocall @ 3 hours
2017-02-08 08:45:23 -05:00
af068d8ff4
shuttle autocall @ 3 hours
2017-02-08 07:37:57 -06:00
a5ba49d11b
titlescreen fix
2017-02-08 07:14:10 -06:00
4cc31d776c
Merge pull request #208 from Poojawa/runtime-fixers
...
Runtime fixers
2017-02-08 02:02:46 -05:00
dfb3df1583
reverts save file version bullshit
2017-02-08 00:54:48 -06:00
3f8df133d8
other things I missed
2017-02-08 00:49:31 -06:00
d0f50d5488
other things I missed. oops
2017-02-08 00:38:26 -06:00
883ebad540
mob fixes
2017-02-08 00:27:04 -06:00
68bad60a1c
admin modules
2017-02-08 00:17:48 -06:00
f49c0c0268
some modules things
2017-02-08 00:06:03 -06:00
01ed369034
game folder
2017-02-08 00:02:05 -06:00
f6dfa820fd
onclick and datums
2017-02-07 23:55:43 -06:00
06e49c2df3
define things and soapstone strings
2017-02-07 23:52:33 -06:00
657684c1b7
Merge pull request #207 from LetterJay/master
...
runtime cleanup and commit revert
2017-02-08 00:33:10 -05:00
463bcc2f31
runtime cleanup!
...
This reverts commit ceebde6620
2017-02-07 23:30:59 -06:00
LetterJay