Commit Graph

378 Commits

Author SHA1 Message Date
CitadelStationBot
fe57757fd7 Adds a proc to check if the current thread is from an admin advanced proc call (#400) 2017-04-15 14:41:36 -04:00
CitadelStationBot
09572935ca [MIRROR] Fixes plasmamen burning to death in cloning pods (#382)
* Fixes plasmamen burning to death in cloning pods

* fix travis
2017-04-15 14:36:59 -04: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
TalkingCactus
bd1a26de8d 60s->20s (#390)
Lowers Timer Recovery from 60s to 20s
2017-04-15 05:48:08 -04:00
CitadelStationBot
773ff04310 hotfix for immutable mixtures (#368) 2017-04-15 03:48:26 -04:00
Poojawa
9e72b1b8fd /tg/ 4/14 (#367)
* outside code stuff

* defines, helpers, etc

* everything not module

* modules

* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
884fb45516 Fixes compile issues with vore code (#362)
* Fixes compile issues with vore code

* Update voreconstants.dm

* Update resize_vr.dm

* Update tgstation.dme

* Update parrot.dm

* Update pet.dm

* Update fox.dm

* Update mouse.dm

* Update farm_animals.dm

* Update dog.dm

* Update cat.dm

* Update monkey.dm

* Update alien.dm

* Update vore_vr.dm

* Update vorepanel_vr.dm

* Update bellymodes_vr.dm

* Update belly_vr.dm

* Update living_vr.dm

* Update voreconstants.dm

* Update fox.dm
2017-04-14 19:39:08 -05: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
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
TalkingCactus
616ce57f26 Gas The Kayaks Raft War Now - Today at 10:07 PM please add a "cancel" button to the edit flavor text button (#333)
* we did it reddit

* hoopla
2017-04-02 18:35:31 -05:00
ktccd
1a5ec9c3a2 Captain's Laser accessible by captain (#324)
Changes the access required from centcomm special ops to captain access.
Comment says it was on purpose, but seems poorly explained. As it is, a
lot of people don't seem to know display cases even CAN be opened. And
the gun is the captain's, why would it need special ops access to
retrieve?
2017-04-02 13:03:42 -04: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
ee23bffa83 Merge pull request #325 from ktccd/Ninja-Tech-Fix
Ninja tech-theft fix
2017-04-01 10:05:31 -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
37d46e87e6 Fixed verb problem
Now the syndi_borer shouldn't be able to use verbs to reproduce
(Previous PR only removed the action button on the HUD).
2017-04-01 03:28:01 +02:00
ktccd
0308042473 More borer work
Couple of changes.  Hopefully the objective is clearly defined now, and
it is separate from the team borers you normally have.
2017-04-01 02:49:59 +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
LetterJay
d6fd1de6ad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-03-31 14:04:52 -05: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
LetterJay
d7222a44eb name change of var 2017-03-29 23:04:52 -05: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
LetterJay
c79ad8b71f remove debug print 2017-03-29 20:25:30 -05:00
LetterJay
44715ab70f listed autoEnd as a var known as GameTimer 2017-03-29 20:23:24 -05: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
LetterJay
4d5a42e391 auto end tweak 2017-03-29 16:07:36 -05: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
LetterJay
6b91c9281d shuttle auto call after 3 hours 2017-03-27 17:07:10 -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
d8d2bf1006 fix for missing area, map should load 2017-03-26 13:01:28 -05:00