Commit Graph

76 Commits

Author SHA1 Message Date
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58
1d4ae5196c it works 👍 2017-11-13 17:00:26 -05:00
LetterJay
2f205af2ac Update preferences.dm (#3691) 2017-11-01 11:38:44 -07:00
LetterJay
e0cbc7b9a2 Fixes character issues on creation 2017-10-30 05:32:06 -05:00
LetterJay
a595bee5af Update preferences.dm 2017-10-29 01:58:33 -05:00
LetterJay
95023664dd Update preferences.dm 2017-10-29 01:53:35 -05:00
LetterJay
f77b66ebb9 Update preferences.dm 2017-10-29 01:40:28 -05:00
LetterJay
bea9365ea9 Merge branch 'master' into upstream-merge-32093 2017-10-29 02:27:52 -04:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
KorPhaeron
ef9c27ef0a Roundstart species pref fixes/removes redundant species config 2017-10-26 12:00:56 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
KorPhaeron
e4f76a79a5 Allows species to be blocked from ever being roundstart, can now choose your Halloween species 2017-10-20 10:11:35 -05:00
Supermichael777
63aa1c7153 Makes the pda font a prefernce 2017-10-04 19:28:57 -05:00
LetterJay
747312cb6d updates 2017-10-01 00:59:59 -05:00
LetterJay
03ee5a9303 Update preferences.dm 2017-09-29 23:43:39 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
076ba227e5 Merge pull request #2583 from deathride58/screenshake
Extra Screenshake and Screenshake accessories.
2017-09-24 11:34:50 -04:00
ktccd
c8aeec815a Adds sanitation to flavor_text (#2926)
Exactly what it sounds like. Boy, my security skills are shit, for
someone who's supposed to be studying exactly this shit at uni, isn't
it?
2017-09-24 03:15:02 -05:00
deathride58
4e793a5630 Should work 2017-09-23 13:17:21 -04:00
deathride58
20700dab57 change for the sake of change - laying the groundwork to let players directly change the percentage of screenshake 2017-09-23 11:18:48 -04:00
deathride58
bfc9aba710 damage screen shake will no longer show when screen shake is disabled 2017-09-03 20:12:23 -04:00
deathride58
a8328aad8e Overcomplicates things 2017-09-03 18:34:16 -04:00
deathride58
72de6c3968 Nested ternaries? 2017-09-03 17:20:58 -04:00
deathride58
5a618ed548 adds reduced option for screenshake 2017-09-03 13:22:50 -04:00
deathride58
feeb76e472 Nerfs KA screenshake, moves cit_screenshake.dm to modular_citadel/, and adds a screenshake pref. 2017-09-03 05:24:14 -04:00
LetterJay
3e0ead1204 Merge branch 'master' into upstream-merge-29105 2017-09-02 07:11:32 -05:00
LetterJay
74307f2858 Update preferences.dm 2017-09-02 06:55:52 -05:00
ktccd
597c048975 This was bothering me (#2449)
Now it's fixed.
2017-08-21 17:03:41 -07:00
CitadelStationBot
196c9d0597 Adds tracking amount of time spent playing departments 2: The fall of the Assistants. 2017-08-20 06:01:24 -05:00
ktccd
62a7d4301f Refactored flavortext.
Flavortext is now stored in DNA features and can thus be stolen by
changelings and restored by cloners/pods/etc.
Also added genitals_use_skintone to the random features proc, 'cause it
was missing (my bad, I was even newer at messing with DNA back then :S).
2017-08-11 20:13:01 +02:00
ktccd
4fdd3215d6 Fixes no-genitalia
Genitals now updates with any changes.
All the other changes in the code you see in the commit, I didn't touch.
Nothing changed, git just thinks I replaced some lines with themselves
for some godawful reason.....
2017-08-06 11:12:13 +02:00
CitadelStationBot
d7e66b7a3a You can now control-click action buttons to lock them in place 2017-07-24 17:05:41 -05:00
CitadelStationBot
9863f88366 [READY]Adds examine tooltips 2017-06-18 21:58:37 -05:00
CitadelStationBot
a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916)
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
2017-05-18 09:37:30 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808)
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
LetterJay
43318a88a5 rej fix 2017-05-10 21:59:41 -05:00
LetterJay
de2d0985c4 Merge pull request #440 from Citadel-Station-13/upstream-merge-26134
[MIRROR] Refactors dbcon into a subsystem
2017-04-19 20:46:02 -05:00
TalkingCactus
6f0aa809df Patches for 4/18/17 (#454)
* fixes modular receiver sprites

* fixes legs rendering for taurs

* fixes shoes not rendering in UI for nagas

* typo fix in preferences.dm

* crewsimov

* Revert "fixes legs rendering for taurs"

This reverts commit 8a64c0c80af8a6798639bb151d1448eeb454ac5d.

* fixes looc logging

* fixes gamemode voting

* admin respawn bypass

* thanks GitHub Desktop

totally wanted to omit the very important if()

* proc tweak

* savefile sanitizing
2017-04-18 18:38:23 -04:00
CitadelStationBot
278cbbaf35 Refactors dbcon into a subsystem 2017-04-17 09:46:09 -05:00
ktccd
c785038994 Huge Sprite Rework (#342)
* Revert "Revert "Huge Sprite Rework""

* Compilation of all feedback fixes

This commit contains all the suggested fixes so far and the changes we
came up with through discussion about the code.
For example, genitals **may** now use alternate icons for aroused
states, but does not have to, this is decided by a boolean variable in
the sprite accessory itself, defaulting to not using alternate icons.
Genital icon_state names now follow a new format to match these new
options in a modular way for all kinds of genitals.

* Conflict solving

reformats all the taurs to use the TAUR layer instead of the BODY_FRONT
layer. Same for the new Eevee sprites.

* Committing the old, unfixed file.

This will cause errors if used, but at least it won't cause conflicts.

* Contains fixed sprite names

The shepherd taur body should STILL have a hole in the body due to a
pixel error.
I have forgotten which pixes these are, so.... **le shrug**

* Anger commit

Commiting this in anger. I WILL make it work damnit!

* Proper name fixes.

Also renames the taur cow to no longer have an incorrectly duplicate
icon_state.

* Shepherd taur pixel fix

Fixes the missing pixels from the taur body that caused a hole to appear
when viewed from the sides.

* Conflict resolution

This PR will cause some sprite-breaking overlay errors.
But it's the only way to handle the conflicting .dmi.
So I'll make a separate PR to fix the sprites later.

* Fixes global lists

Now they use whatever weird new system we got for them.
2017-04-15 07:24:44 -04:00
LetterJay
d0347280ce adds vore back (why this was removed, I have no idea) 2017-04-14 13:40:44 -05:00
Poojawa
7e9b96a00f April sync (#360)
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
2017-04-13 23:37:00 -05:00
LetterJay
d12a1d88a5 Revert "Huge Sprite Rework" 2017-04-04 16:34:55 -05:00
ktccd
cc1768b872 Huge Sprite Rework
This is a big one, I reworked:
Vagina sprites, Breast sprites, both onmob and item, and some Taur
sprites
How Taur sprites are layered, finally making genitals show for Nagas as
they should.
How colours are chosen (Humans can enable/disabled matching genitals to
their skintones, everyone else has to pick a colour).
Vaginas and Breasts now follow the same naming convention for sprites
that penises use, so all genital organs can be rendered using the same
piece of code. This means that breast sizes have dropped to
single-letter variants, since those are what we got sprites for (Because
the cup-size is now the Size of the obj).
Breasts now have shapes! So far we only got the "pair" shape, but we got
code-support for other variants.
Vaginas can now also be chosen and will render properly, meaning we now
have more of them to choose from (Some of them terrifying). They don't
really use a size, but there's code support for it if sprites would be
made for it.
Breast items now change their size and color to the owner's when/if they
somehow lose the organs (gibbing for example). Both Breasts and Vaginas
change their description to match what the object is set to look like,
sprites are lacking in that area however.
Minor variable error in the penis-description code fixed.
Taur sprites renamed to use the correct layers. Shephard sprite bug
fixed where there was a missing 2 pixels in the middle of the body.
2017-04-04 17:28:42 +02:00
TalkingCactus
0b45e97b3d Automatic MC Re-Starter 9001 (#322)
* fixed runtime in air.dm

fix was made in LINDA_turf_tile.dm though

* fixes runtime in corpse.dm

* fixes runtime in species.dm

* automatically restarts the MC sometimes

When the timer SS crashes, here's the fix

hardcoded with love

* supermatter area icon

* better admin logs

* better mentorhelp message for admins

* fixes map

* removes depreciated var

* MC rebooter 9001
2017-03-28 07:29:59 -04:00
Poojawa
f67e9f6d87 Bleeding edgy refresh (#303)
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
2017-03-21 11:44:10 -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
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
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
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