Commit Graph

563 Commits

Author SHA1 Message Date
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
Poojawa
194c5ca57f Update README.md 2017-04-11 04:36:20 -05:00
Poojawa
9f0da4288e Update README.md
reflects Citadel station information.
2017-04-11 04:30:30 -05: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
aa5cc241f7 Merge pull request #340 from Citadel-Station-13/revert-339-Genital_Overlays
Revert "Huge Sprite Rework"
2017-04-04 16:35:35 -05: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
073e0a8351 Adds changelog
Adds a changelog that is more readable to the players than what's in the
PR.
The PR changelog itself is more for coders to read, as it has more
details that players wouldn't care about.
2017-04-04 17:45:05 +02: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
LetterJay
6ae099b4ce Merge pull request #326 from Cw3040/master
Minor Edits to Box
2017-04-03 02:18:14 -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
LetterJay
609307fb26 Merge pull request #336 from ktccd/Changelog_additions
Late changelog files
2017-04-02 13:23:21 -05:00
ktccd
e6bab891a2 Additional borer information
Forgot to mention which section of the syndicate-uplink it can be bought
from.
2017-04-02 20:11:26 +02:00
ktccd
746a8df77e Late changelog files
These are changelogs for the more public changes I've done so far, as I
didn't know how changelogs were made previously.
2017-04-02 20:06:49 +02: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
TaxMaster
5b2b4b2e0a Literally just a changelog
srs
2017-04-02 09:33:00 -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
Cw 3040
6d8fbd3149 Minor Tweaks
Tweaked maintbar some more.
2017-04-01 16:58:19 -04:00
Cw 3040
1eb8ea1f51 Wire Fix 2017-04-01 15:06:09 -04:00
Cw 3040
70d716d4b8 Forgotten Fix
Cobweb removed
2017-04-01 14:59:12 -04:00
Cw 3040
39101651ae Merge remote-tracking branch 'refs/remotes/origin/test' 2017-04-01 12:20:34 -04:00
Cw 3040
cf90cb56ac Requested fixes
Improved upon the maintenance bar, and included fixes TalkingCactus
outlined.
2017-04-01 12:16:55 -04: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
f3ab70b2ae changelog 2017-04-01 09:57:52 -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
TaxMaster
9aeb8226cb Merge pull request #5 from Citadel-Station-13/master
Further updating
2017-03-31 17:12:00 -05:00
LetterJay
2ef4237f09 changelog cleanup 2017-03-31 14:10:26 -05:00
LetterJay
d6fd1de6ad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-03-31 14:04:52 -05:00
Cw 3040
b33d1b1bbc The REAL fix 2017-03-31 11:21:59 -04:00
Cw 3040
99d360f5a2 Revert "Fix 1"
This reverts commit 528372396c.
2017-03-31 11:17:27 -04:00
Cw 3040
528372396c Fix 1 2017-03-31 11:14:18 -04:00
Cw 3040
3e01fdacd2 Revert "Change pt2"
This reverts commit 4494019f0d.
2017-03-31 11:11:13 -04:00
Cw 3040
4494019f0d Change pt2
Lowering amount of windows, tinting those that remain.
2017-03-31 06:33:57 -04:00
Cw 3040
4dd23a0940 Minor Edits to Box
Added larger maint bar, converted smaller maint bar to a storage room.
Pic related: http://i.imgur.com/iQR2aYG.png
2017-03-31 05:53:35 -04: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
d96549fa8d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2017-03-30 17:04:18 +02:00
LetterJay
d7222a44eb name change of var 2017-03-29 23:04:52 -05:00