230 Commits

Author SHA1 Message Date
Fermi 587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Fermi c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa 53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Linzolle daba09582a move to misc.dm 2019-09-11 10:18:10 -05:00
Ghommie 36ffd3d6a8 More lines. 2019-09-01 03:35:36 +02:00
Poojawa 0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
Fermi eb9e6a041d Ghommie's fix. 2019-08-09 12:17:54 +01:00
Poojawa 283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Poojawa 3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
kevinz000 08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
Poojawa 4d895ae6c0 Gang victory news report and last words for discord bot
also slight improvement to gangster greetings
2019-07-13 08:38:19 -05:00
Ghommie 03315d1cbb Ports a toggleable darkmode to the game! 2019-07-05 22:29:50 +02:00
Ghommie ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00
Ghommie 0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
Ghommie 67f00fc049 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42 2019-06-24 16:48:15 +02:00
Ghommie 55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
Ghommie 093b0a15ed alakazam 2019-06-10 14:52:23 +02:00
Ghommie e62d17f5ab more pda sprites 2019-06-10 02:38:16 +02:00
Ghommie b4ccfe078a snap 2019-06-10 00:35:57 +02:00
Ghommie 79c4ce502e more pda skins. 2019-06-10 00:28:43 +02:00
Ghommie d2e216f2de tested fixed tested fixed tested. 2019-06-09 19:55:08 +02:00
Ghommie 52d217a92b deathride man good. 2019-06-08 21:48:39 +02:00
Ghommie 480ee9a9da Reskinnable PDAs. 2019-06-08 19:55:47 +02:00
Ghommie b6f35435ec Ports the get_area conversion to define. 2019-06-07 06:50:26 +02:00
Poojawa f6f4c946e6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-22 00:08:13 -05:00
deathride58 06ea7de46b [S] Fixes a fairly huge vector for server crashes 2019-05-13 21:49:33 -04:00
Poojawa fcdc748bf1 u h g. I hate this 2019-05-10 07:07:09 -05:00
Poojawa 88831da8f4 it's the one part that I keep saying I just need to get around to 2019-05-09 14:43:05 -05:00
Poojawa f244d3fdca system's mostly working
need to polish out the get_blood_dna_list runtime
2019-04-16 11:30:36 -05:00
Poojawa f58cc09aed Some slight fixes 2019-04-16 08:53:19 -05:00
Poojawa 60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05:00
Poojawa b393789f19 Character Creation Overhaul (#7987)
* Rebase fail. good thing I made back ups. c:

* Tails more or less done

* wouldn't update cleanly otherwise

* It's completly working now. holy fuck I did it

Just need the refurbished body markings done, then to chop 'em up for full PR status

* MARKINGS DONE AAAAAAAAAAAAA

* fixes digi legs that didn't convert correctly

* ports the refractored preferences

Kinda ugly now tbh. but fuckit

* quality sweep, things should should properly now in general

* Taurs converted and improved! BODYMARKING -> MATRIXED

* oops. s'what I get for not compile checking

* remember to throw shade at furries

* vigorously update markings upon switching species and colors

* re-adds old wolf ears, Big Wolf fixes snout bugs

* few more snout tweaks

* cut the lists, cut everything. reeee

* This code I s2g

* Adds context clues to preferences

Hopefully people will read them before making an OOC fuss

* Fixes hands and feet markings with this one weird trick

remember kids, proper layering and order of operations is important

* Sprite tweaking and polishing

Sergal stuff being worked on

* a few QoL things for species swapping

* how the fuck did I miss these markings

* fleshes out sprites in preperation for marking experimentation later

* fixes catboy problems

* Mam_snout is a thing now,

* pixel adjusted tails, cleaned up wah tail a bit better

also gets digitgate legs missing pixels fixed

* cleans up more shit. ree

* force "plain" instead of none to avoid missing pixel reports

* tweaks to reinspire mapdiff

* Clean up Preference UI

Looks a little better now

* k

* doubly ensure None markings aren't valid

* reee spessman barbie

* brightens pixels around tiger head markings

* YEENS

* Cat ears tweaked because it triggers Kev otherwise

* another session of quality control

* Crows and crow accessories

* husk fixes

* works good enough, mission accomplished

* fixes the proc properly

* cleans up brute force code that isn't needed

* c a t
2019-02-22 05:59:05 -08:00
Tupinambis e5e97302d4 Adds a new security level: Amber (#7976)
* Adds the Amber security level.

* This isn't C
2019-02-05 17:53:58 -08:00
deathride58 ebaf5ab6a1 Makes the eyeblur effect scale depending on how much eyeblur you have (#7727) 2018-11-16 14:46:33 -08:00
Poojawa 42b1d03d2a [READY] Tauric full body suits (#7639)
* let's get this back on the table

* split 'em up because sorting memes

* Gets stuff code-ready, sprite work to continue

Engineering / Atmosia / Cheng
Civilian Space
Blood Red / Red and Black
Riot / Armor vests
Radiation / Fire / Atmosia Fire
Bio Suits (Viro/CMO/basic)
ERT / Deathsquad

* It's messy, but it works so w/e

* let there be more tail access

* finishes naga taur spriting

* memes

* super fixes any lingering memes

* leg experiment

* nah, this isn't gunna work.

* poked at canine again

* saving memes

* tweaks some fixes and things

* finished quad suits, added bomb suits for nagas also

* "inconsistant indentation" Byond you fuck

* Take that, byond

* The war on Byond continues

* let's make sure the explorer gear uses fancy sprites

* syndiE ??? wtf did I sleep type
2018-10-18 09:30:37 -07:00
Poojawa 42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa 49467dbd72 Defines 2018-09-11 00:45:50 -05:00
deathride58 586b27d489 adds antag ooc (#7477) 2018-08-23 00:25:27 -07:00
deathride58 99e1852493 Can be toned down JUUUUUUUST a smidge. Let's see how this new value works in practice 2018-08-11 20:45:17 -04:00
Unknown 054be386de readded defines; tweaked size 2018-08-08 12:39:19 +02:00
Unknown 9ca7e38f7a Blurry eyes just got blurrier 2018-08-08 11:42:30 +02:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58 816257ae7d fuck 2018-07-05 01:38:46 -04:00
deathride58 63013f8964 everything to controllers 2018-07-02 00:10:31 -04:00
Ling 49bd6e24fb Fixes pda style loading 2018-06-03 09:02:42 -05: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
ShizCalev 49bf67ed1d Updates BYOND links to use HTTPS (#37918)
* Updates BYOND links to use HTTPS

* revert

* if -> If
2018-05-20 15:31:28 -05:00
LetterJay 80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00