Commit Graph

251 Commits

Author SHA1 Message Date
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
Squi-RL
cdc32c98fa Eevee/Eeveetaur additions! (#359)
* Adds eevee ears and tail

* Adds eevee neck fur sprite

* Adds an eevee taur sprite

* adds the code for Eevee and it's taur body

allows players to choose said things
2017-04-12 23:38:35 -05:00
Poojawa
8b7bd1dbb8 Removes Sizeplay (#356)
* Update tgstation.dme

Removes sizeplay entirely.

* Update voreconstants.dm

* Update living.dm
2017-04-12 23:37:57 -05:00
ktccd
5bca6c759b Subtle emote fix (#350)
* The Worst Kind of Fix

Doesn't actually fix, instead completely replaces the previous verb that
was named as an EMOTE without being one for real.
Now we use a real emote, shamelessly cribbed together from what I
understood from the custom emote and the base emote procs.
Testing seems to indicate success, now even for simple_mobs, since this
is implemented on the mob/living level. (Should it be on the mob level?
I honestly don't know if basic mobs should have this emote?)

* Removed uneeded prompt

This looks like the same problem the "me" emote has, fixed now. Maybe I
should do the same to the "me" emote later...

* Adds changelog

For players to notice.
2017-04-12 23:37:36 -05:00
TalkingCactus
40cf3e9642 quick fix (#355) 2017-04-11 22:20:48 -04:00
lm40
d64cca1b7e Fixes digestion messages displaying to everyone nearby (#349)
* Update bellymodes_vr.dm

* Update bellymodes_vr.dm

* fuck

* actually no i won't
2017-04-11 14:53:20 -04:00
TalkingCactus
89a99d78d1 Adminhelp prompts will now be larger to allow you to proofread large responses and PMs (#345)
* bigger box

* even bigger

well not really, but it's better anyway

* fuck i didn't tick these

* bigger /me input

double emote size as well, stop complaining about cutoffs and don't make
me regret this

* cleanup
2017-04-09 05:53:44 -04:00
LetterJay
d12a1d88a5 Revert "Huge Sprite Rework" 2017-04-04 16:34:55 -05:00
LetterJay
20f1647d77 Merge pull request #339 from ktccd/Genital_Overlays
Huge Sprite Rework
2017-04-04 14:03:29 -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
katnep
b26319cb16 Access changes for chaplain g.tech and engineers (#297)
* access tweaks

removes maint access from roles that don't need them, I.E janitor, and
assistant

* assistant tweak

removed checking for assistants have maint config

* Revert "assistant tweak"

This reverts commit 63fe914117a9e9c6b52a9effe29c2131c8da7a4e.

* Revert "access tweaks"

This reverts commit 68144943ee0e8b33cd8560a9dd4620532891424c.

* access changes (actually valid edition)

adds atmos access to engineers even on high pop rounds, because atmos
have all engi access and it makes sense to have it the other way round

strips the science access of geneticist because they don't actually need
to be in there even if they are technically researching genetics

* chaplain

removes chaplain theatre access becuase they don't really need it

* detective sec access

gives detective security access on skeleton crew

* Update security.dm
2017-04-03 14:47:51 -04:00
LetterJay
2e285dff0b Merge pull request #335 from TaxMaster/VendingPartDuo
VG Vending 2: Free Market Boogaloo
2017-04-03 02:54:12 -05:00
TaxMaster
719b5a3e96 aaa
aaa
2017-04-02 19:35:32 -05:00
TaxMaster
956976dbfd A little thing
Adds everyone's favorite repeating numeric man's overcoat to the meme
crate.
2017-04-02 18:42:51 -05:00
TaxMaster
c270dd2b72 Fixes
The comment in cit_uniforms was just to try and get an answer why icons
were vg_clothes.dmi
2017-04-02 18:37:39 -05:00
LetterJay
841ecb3286 Merge pull request #328 from ktccd/Syndicate_borer
Syndicate borer added
2017-04-02 08:17:47 -05:00
TaxMaster
3782d41b15 Buy muh filters
Added a soviet uniform to the reenactor crate.
2017-04-02 08:15:50 -05:00
TaxMaster
45548d26c6 THIS (DOESN'T) VIOLATE THE NAP
Clothing 2: If it doesn't pass i'm seriously going to stop trying
boogaloo
2017-04-01 22:50:05 -05:00
ktccd
2707ddd750 Cloning-Genitalia-Fix (#277)
* Cloning-Genitalia-Fix

Fixes the issue with genitals not being re-created with cloning. This
should make it so other methods of coming back also gives the organs
your DNA says you should have, such as podding people.

* Sanity checks and fixes

Removed the OLD sanity check for drawing eyes. It was refusing to draw
eyes if you had ANY disability. 's far as I know, blind people still
have eyes and so do mute people.
Also, put a sanity check in give_genitals, just in case a species has
DNA with genitals but is a NOGENITALS species. Somehow. IT COULD HAPPEN,
ALRIGHT?! ^^

* TRAVIS LOVE ME AGAIN

This commit fixes the problem that made Travis hate me previously. Even
though THAT part of the code had not been changed...
Anyway, it looks more neat now, so that's good.
2017-04-01 11:40:12 -04:00
LetterJay
3bf0692ae6 Merge pull request #329 from LetterJay/master
disables flightsuits
2017-04-01 10:13:42 -05:00
LetterJay
ba94d1f30b disables flightsuits 2017-04-01 09:52:38 -05:00
ktccd
d471824fba Implemented feedback
I'll stick with disabling it entirely on nuke ops, until I see a bit how
well this item performs.
Possible solutions: Make a variant for nuke ops that has a different
cost or just leaving it disabled for them.
2017-04-01 15:31:14 +02:00
ktccd
c36a0845af Traitors/nukeops can now buy borers
This adds a subtype of borers to the traitor uplink. This version cannot
reproduce and is loyal to the owner who released it.
The borer's objectives are tied to the objectives of their owner and
will greentext together with them.
2017-04-01 02:48:16 +02:00
ktccd
a817cba3e4 Solves Ninja-tech theft
You can now steal tech from the R&D console directly.
You can STILL steal it using a disk, by hitting your suit with the disk,
but people don't seem to use that. This code is horrible, by the way, it
does nothing to fix the fact that it's a copy-paste for both the server
and the console.
2017-03-30 23:19:33 +02:00
ktccd
376dd1f89a Adds custom emotes to slimes (#320)
Does not add the other human emotes, since they seem a bit odd to put
in.
Slimes needs custom emotes for... reasons. You all know why, don't make
me say it in writing! >_<
2017-03-29 22:57:45 -04:00
katnep
31d0f4cb1f Mining Vendor Redo (#298)
* Mining Vendor Redo

basically Re adds all the stuff i added back at the start of 6th port,
also re added stimpacks to the lsit becuase i don't see why they needed
to be removed from it

* whetstone removed

whetstone removed

* price balances

just tweaked the prices of the new bundles to make them actually worth
purchasing following a 5 for the price of 4 standard

* The final change

finishes the requested changes

* removes excessive line spacing

* removes trailing comma
2017-03-29 17:11:00 -04: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
LetterJay
ef89eba41e Merge pull request #315 from kevinz000/patch-1
Emergency fix for potential server crashing
2017-03-28 00:49:42 -05:00
TalkingCactus
756180afd6 Automatic MC Re-Starter 9000 (#319)
* 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
2017-03-27 03:16:56 -04:00
kevinz000
c432ec0859 Update chameleon.dm 2017-03-26 13:14:16 -07:00
LetterJay
78616ca6a9 *reverts back to the separated who list
*fixes a lot of mentor related issue (both them not loading and missing verbs)
2017-03-26 10:44:42 -05:00
TalkingCactus
c997ebcabd Removes Lag (tm) (#313)
* sensible fixes

* this too

* some more

* fixes chair icons

reverted to state before tg pull

* fixes telecomms icons

revert to state before tg pull

* fixes research icons

reverted to before tg pull

* de-whitewashed the stools

* fixed missing broadcaster sprites

* always load from the savefile

helps custom servers who don't want to fuck with the config, this will
never not be wanted with the system we have

* stop it, ghosts

* fixes limb augmentation

https://github.com/tgstation/tgstation/pull/25446

* removes lag

* re-adds sounds

* exception

* makes travis happy
2017-03-26 09:39:29 -04:00
kevinz000
5688b6b306 Update chameleon.dm 2017-03-26 03:41:21 -07:00
ktccd
6db6e99830 Ghost-role arousal fix (#283)
* Ghost-role arousal fix

Fixes it so ghost role spawners respect arousal preferences of the
ghost.

* Arousal should respect species traits

This is *currently* having no effect, as no species at the time of
writing uses NOGENITALS species trait. But good for future species I
think.

* Arousal-fix-fixed

Made on_species_gain do the arousal check and apply it properly. Moved
equip to happen AFTER the ckey is assigned, as I couldn't check the
clients prefs before that and it just defaulted to TRUE.
Problem: Human ghost-roles are already human and would not use
on_species_gain. I had 2 fixes for this: Either I made them do so
anyway, doing set_species with human. This is probably redundant and
might break things in some unexpected way....
2nd possible fix is what I am pushing now, just making an else statement
for that situation.
2017-03-26 06:32:51 -04:00
kevinz000
2a8fcb3929 Update chameleon.dm 2017-03-26 01:31:57 -07:00
kevinz000
22cc36345f Update chameleon.dm 2017-03-26 01:30:32 -07:00
Poojawa
a8d181c00c Update admin_verbs.dm (#314)
Enables moderator staff to issue controller restarts
2017-03-25 14:52:44 -05:00
LetterJay
1d518bb4dd updates maploader, fixes a few things 2017-03-24 01:39:11 -05:00
Poojawa
7ad5e22830 Wew lad (#305)
* 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

* based cyberboss.

* you'd think github would suck less.

* vendors

* tweaks and specialty vendors.

* map things

* go away shitty omega

* qdeletion spam supress, maps.txt tweaks

* shuttle lights
2017-03-22 02:55:33 -05:00
TalkingCactus
fcc5e0e2f5 fixes preview icon runtimes+ (#304) 2017-03-21 21:22:47 -05: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
TaxMaster
b617e06a30 A small fix (#279)
* Adds In Deep from RA2 into the roundstart music

* Adds In Deep from RA2 into the roundstart music

* A few minor things

Fixes up my plasmagun code so that the projectiles have an
impact_effect, Adds the enclave power armor from Fallout 13 (currently
admin spawn only), and adds a Krotchy doll into the arcade prize list
(Sprites were in Fallout 13's git but I suspect it originated somewhere
else).

* Remove crap

Removing the extra crap so its now just a single-line fix.

* AAAA

ultra-hotfix
2017-03-19 21:03:37 -04:00
LetterJay
3e294af826 'Give' verb 2017-03-19 13:57:12 -05:00
LetterJay
1675d24d71 Merge pull request #282 from katnep/CQC-remastered
Cqc remastered
2017-03-19 08:42:08 -04:00
LetterJay
d843837abf Merge pull request #270 from TalkingCactus/JMP-n-STUFF
Improved Atmospherics Logging
2017-03-18 23:42:11 -04:00
Verkister
df8d69535b New attempt at fixing shit. Also some sprite stuff.
-Messed around with another air proc I saw runtiming on server.
-Attempted to fix overlays even further. Test run successful but you never know with random chances that hopefully are now as low as the test run let me see.
-Meddled around with transit space. 2 directions were missing a corrective step against negative rng output.
-Added otie snouts.
-Improved contrast in the corvid markings.
-Added tail wag sprites for husky and otie.
2017-03-18 14:08:10 +02:00
katnep
4144a627d7 tweaking the file
trying to get it to show up in traitor since it wasn't showing up after
deleting the nuclear tag
2017-03-14 20:11:57 +00:00
katnep
5e9602265b adds CQC to the traitor mode items
Adds the CQC manual from the nuke ops uplink to be included in the
traitor uplink since sleeping carp is on traitor and is significantly
more powerful where as CQC is more intent cycling and reactions so i
think it offers a varied play style oppurtunity for those who don't want
to take sleeping carp but like the martial arts aesthetic
2017-03-14 19:53:44 +00:00
TalkingCactus
51d20e13ef Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into JMP-n-STUFF 2017-03-10 12:56:18 -05:00
TalkingCactus
09ec454325 Random Fixes + Dildos (#268)
* I'LL SNEAK THIS IN, TOO

* will it blend

* event tweaking

* new kinkmate sprite

* savefile bugfixes

* drinks got overwritten again

rip

* replaces missing styles

* dildos

* last bit
2017-03-10 12:51:16 -05:00