Commit Graph

244 Commits

Author SHA1 Message Date
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
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
LetterJay
463bcc2f31 runtime cleanup!
This reverts commit ceebde6620.
2017-02-07 23:30:59 -06:00
LetterJay
ceebde6620 Revert "sync"
This reverts commit a432886ba3.
2017-02-07 23:21:03 -06:00
LetterJay
84f36e3496 adds missing shark overlay 2017-02-07 18:05:38 -06:00
LetterJay
b24808f39a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-02-07 17:50:29 -06:00
Poojawa
356abcd2e5 Species whitelist (#206)
* Body markings

General Species because I give up trying to make each of them
species-specific.

* SAVE FILE UPDATE

* whitelist work

* updated sprites to reflect new species settings

* It's just whitelist stuff broke as shit now

* additional sprite work
2017-02-07 10:36:32 -06:00
LetterJay
a432886ba3 sync 2017-02-07 00:58:30 -06:00
TalkingCactus
cdea2c6766 Adds Arousal as a Damage Type (#204)
* auto vote runtime error fix

* part 1

* conflict resolution

stop fighting, damnit

* includes

* species flags

* toggleable

* reagent recipes
2017-02-06 23:57:29 -06:00
Poojawa
fc18933fc8 return of the station alarms (#205) 2017-02-06 21:42:22 -06:00
Poojawa
17dac7f0b5 Species markings (#203)
* Body markings

General Species because I give up trying to make each of them
species-specific.

* SAVE FILE UPDATE
2017-02-06 04:57:48 -06:00
Poojawa
feb600fdc1 taur peets (#202)
* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping

* quick taur fixes

coloration and most layers sorted Missing peets have been readded
2017-02-06 02:40:28 -06:00
Poojawa
73b6b33f79 TG sync Sunday (#201)
* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping
2017-02-06 00:36:56 -06:00
Poojawa
aeeca195c7 Vore fixes (#200)
* wagging tails!

* oh

* also these two runtime things

* some delta too

* maybesorta

* Moves vore stuff lower into modules

* Vore fixes ftw
2017-02-05 05:11:42 -06:00
Poojawa
94fea66343 Fixes Taurs with one weird tip (#198) 2017-02-04 23:08:37 -06:00
LetterJay
0a1927ce1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-02-04 10:35:30 -06:00
LetterJay
18e597bcb0 runtime cleanup 2017-02-04 10:35:14 -06:00
LetterJay
728e3a50f3 Merge pull request #197 from LetterJay/master
maint access during radstorms
2017-02-04 11:29:14 -05:00
LetterJay
7725248097 maint access during radstorms 2017-02-04 10:23:27 -06:00
LetterJay
1b6f0e4d34 Merge branch 'master' into tails-and-taurs 2017-02-04 11:22:16 -05:00
LetterJay
63a848b1b5 shuttle auto call 2017-02-04 10:10:31 -06:00
Poojawa
69bc9f5758 AAAAAAAAA 2017-02-04 04:53:31 -06:00
Poojawa
9b0f9af80a Shifting snowflake to other file 2017-02-04 02:05:34 -06:00
Poojawa
2ebea80af0 So I don't have to keep throwing out tweaks 2017-02-04 00:03:07 -06:00
Poojawa
7b7047f9b0 Tail wagging is fixed boys and girls 2017-02-03 22:57:52 -06:00
LetterJay
c8f01869e3 hawks, capras, and donation item 2017-02-03 13:55:38 -06:00
Poojawa
0fcb126658 Wagging tails emote (#194)
* wagging tails!

* oh

* also these two runtime things

* some delta too

* maybesorta
2017-02-03 11:02:12 -06:00