Commit Graph
100 Commits
Author SHA1 Message Date
PoojawaandGitHub d8e0771dcd Better Health Analyzer formatting
Because having it all bunched up is a pet peeve.
2019-11-02 23:14:39 -05:00
PoojawaandGitHub 4820efd047 Merge branch 'master' into access-clarifications 2019-10-25 22:24:56 -05:00
PoojawaandGitHub 7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
PoojawaandGitHub 2286d40882 why am I making it ignore injections????
The world may never know
2019-10-11 01:34:26 -05:00
PoojawaandGitHub 81b4a994e0 Updates Config with Citadel specific links & info
To be used with the in-game button redirections
2019-10-03 18:19:24 -05:00
PoojawaandGitHub a8e16ce27e APC UI autoupdates properly 2019-10-03 14:00:17 -05:00
PoojawaandGitHub d63540164d Travis to 512.1488 for ?. operator compiler fix
```
The ?. operator didn't handle some complex situations properly where it was the left-hand side of an expression and that expression was in turn the right-hand side of another. 
```

Byond fix to ensure the new meme
2019-10-03 13:52:05 -05:00
PoojawaandGitHub 6668630649 Merge branch 'master' into are-those-horns-are-are-you-just-retarded 2019-09-15 23:25:22 -05:00
PoojawaandGitHub a739342a5a Updates Travis to 512.1484
just so everything is checked with the DMI fixes. and various other updates.
2019-09-15 23:21:27 -05:00
PoojawaandGitHub 8ad705ec74 Update curator.dm 2019-08-19 02:16:30 -05:00
PoojawaandGitHub d0d6bc37a6 Merge branch 'master' into job-menu-improvements 2019-08-02 11:55:28 -05:00
PoojawaandGitHub 8c24cb519b Likely fixes vore sounds
Bhjin man bad
2019-07-31 18:30:57 -05:00
PoojawaandGitHub 2e0053aa86 Update traumas.json 2019-07-12 03:06:35 -05:00
PoojawaandGitHub c4f736eb94 Merge branch 'master' into job-menu-improvements 2019-07-10 18:55:29 -05:00
Poojawaandkevinz000 bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602)
* Gentials layered under underclothes

* screm
2019-06-17 11:20:25 -07:00
80659a540b Update modular_citadel/code/modules/arousal/organs/testicles.dm
I guess

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-06-09 09:59:31 -05:00
PoojawaandGitHub cac80ec8c8 Update laborstacker.dm 2019-06-09 01:43:39 -05:00
PoojawaandGitHub d4abb85641 Update preferences.dm 2019-06-02 09:40:18 -05:00
PoojawaandGitHub ba0474feb0 Updates travis to 512.1467
Lots of good updates. we should see if they make stuff better
2019-05-10 08:56:05 -05:00
PoojawaandGitHub fe1692eef3 t a b 2019-04-21 01:57:12 -05:00
PoojawaandGitHub b524c6741d double checking my work 2019-04-21 01:56:45 -05:00
PoojawaandGitHub df057544f2 Merge branch 'master' into screaming 2019-04-20 23:33:23 -05:00
PoojawaandGitHub 6107b2d2be Update living_vr.dm 2019-04-02 21:03:48 -05:00
PoojawaandGitHub 02d7dc4f7f oh right that's a snowflake var 2019-03-03 00:24:38 -06:00
PoojawaandGitHub ff670632dd Removes specific names from clone pod reports 2019-03-03 00:20:27 -06:00
PoojawaandGitHub b3011675b9 Fixes genital-less VR people
probably. works for cloning and it's basically the same process?
2019-03-03 00:11:49 -06:00
PoojawaandGitHub 4255a22697 Removes Mime insulting 2019-03-02 23:53:05 -06:00
Poojawaandkevinz000 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
Poojawaandkevinz000 2f2b089db1 Adds realism to pleasure (#7986) 2019-02-13 20:45:16 -08:00
Poojawaandkevinz000 eb623ebdd6 Pretty late join menu memes (#7978)
* initial things, need to clean up bhjin snowflake

* idk how to fix it

Links work, but it doesn't play nice with the loop.

* Update new_player.dm

don't actually need job_count, tbh I think

* working as intended

* deletes brazil
2019-02-05 17:57:26 -08:00
PoojawaandGitHub 44acfd9858 Re adds missed QOL with posibrain sounds
christ
2018-12-16 01:25:37 -06:00
Poojawaandkevinz000 e35cd61cc1 Probably fixes rogue icon overrides (#7700)
Taurs should use normal legs to avoid bugs.
2018-11-07 12:06:11 -08:00
Poojawaandkevinz000 701b4d8026 makes Nothing an option again (#7702) 2018-11-07 12:05:00 -08:00
Poojawaandkevinz000 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
PoojawaandGitHub 3242e490da Update chat_commands.dm 2018-10-10 06:12:34 -05:00
PoojawaandGitHub c23402c790 Adds more salt to the mill 2018-10-10 06:08:48 -05:00
PoojawaandGitHub 24dcf821a1 Update mine_items.dm 2018-10-08 02:39:08 -05:00
PoojawaandGitHub 7bd3eed030 Merge branch 'master' into patch-2 2018-10-08 02:38:11 -05:00
PoojawaandGitHub 21d31c5763 Gives APCs inherent damage resistance/deflection 2018-10-05 15:30:51 -05:00
PoojawaandGitHub e847f5bb33 Increases APC health and damage resistance values 2018-10-05 15:26:10 -05:00
PoojawaandGitHub 0b245e5eb0 Medihound Tweaks 2018-10-05 08:08:14 -05:00
PoojawaandGitHub 7825905a82 Probably fixes some dress oddities 2018-10-03 15:16:27 -05:00
PoojawaandGitHub 86cef31a40 Update airalarm.dm
updateUsrDialog() is nice.
2018-09-29 22:05:16 -05:00
PoojawaandGitHub e4cdb0c853 Merge branch 'master' into override-override 2018-09-28 01:49:35 -05:00
PoojawaandGitHub dec6fec1ab Update firealarm.dm 2018-09-27 15:37:07 -05:00
Poojawaandkevinz000 3009e8085f Reduces Station aquirable stamina heals (#7593) 2018-09-26 12:38:49 -07:00
PoojawaandGitHub dfe56bbfc2 Removes Ashwalker abilities to wear shoes 2018-09-26 13:00:40 -05:00
PoojawaandGitHub ca7dd3b440 Update furrypeople.dm 2018-09-26 09:02:37 -05:00
PoojawaandGitHub 5b17fbdbdb buffs changling adrenal OD damage
also attempts a revive of travis without PR spam
2018-09-26 01:22:04 -05:00
PoojawaandGitHub afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00
PoojawaandGitHub 7a8c76d9cb Update dogborg_equipment.dm 2018-09-08 20:07:44 -05:00
PoojawaandGitHub 3838a4bd95 Adds intercoms to fetch module blacklist
smh, should probably be an anchored check as well, but who the fuck knows how to make that work with component memes
2018-09-07 13:40:06 -05:00
Poojawaandkevinz000 2066111026 Fixes an <i> noticed in Musician.dm (#7548) 2018-09-07 05:43:00 -07:00
PoojawaandGitHub cfc2e061a5 Update .gitignore 2018-09-05 07:08:59 -05:00
Poojawaandkevinz000 4be05e412e Fixes Fedoras having armor values (#7521) 2018-08-31 12:13:50 -07:00
Poojawaandkevinz000 160f981fcc Fixes Defib mount cloning (#7520) 2018-08-31 12:13:23 -07:00
PoojawaandGitHub 6344de3a14 Updates IC issue message 2018-08-28 22:50:34 -05:00
PoojawaandGitHub d156b50331 Makes carp edible
Because apparently this was never modularized correctly.
2018-07-28 01:53:37 -05:00
PoojawaandGitHub 110878de18 Update jellypeople.dm 2018-04-26 07:27:47 -05:00
PoojawaandGitHub f29859ddbd fixes my shitcode 2018-04-26 07:27:09 -05:00
PoojawaandGitHub a491e364c3 Adjust permissions for Admin Observers (#6247)
* adjusts permissions for the new political officer

* Update admin_verbs.dm

* adds +ADMIN checks to ahelp replies

* Update admin_verbs.dm
2018-04-07 22:33:42 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
PoojawaandGitHub e1cfdff3e7 things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-02 03:53:25 -05:00
PoojawaandGitHub 75a49c53c8 Fixes dogborg sitting (#6112) 2018-04-01 04:06:10 -05:00
PoojawaandGitHub c579d81f4c Vore fixes and a few additions (#6032)
* Fixes saving memes, Adds absorbing and OOC escape

Also allows for people to reload from a slot if they fuck up and delete a belly

* makes sure travis won't flip the fuck out

* fixes some sound issues

* cleaning up some extra sounds, also dragon vore sound settings

* fixes resisting out of guts

* BRACKETS

* Prey now become blind after being eaten.

Use the audible subtle message to continue roleplaying with them!

* Actually make bulges show up in examine

* Fixes cases where transfering between bellies would blind twice

Because, y'know, that make sense. Also added self reminders if any changes happen to JSONs
2018-03-26 04:46:50 -05:00
PoojawaandGitHub 3d03024cef Update all_nodes.dm 2018-03-26 04:39:34 -05:00
PoojawaandGitHub 34718e35cd Update medical.dm 2018-03-26 04:32:36 -05:00
Poojawaandkevinz000 77872a1526 makes IPCs bleed oil (#6054) 2018-03-24 12:35:17 -07:00
PoojawaandGitHub cba5016ab3 Merge branch 'master' into increase-age-gap 2018-03-22 19:53:48 -05:00
PoojawaandGitHub 7b6eee42ce Update all_nodes.dm 2018-03-22 19:36:41 -05:00
PoojawaandGitHub b4a7def5ca Hypospray kits and reworks! (#5907)
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
2018-03-21 15:28:06 -05:00
PoojawaandGitHub 8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
PoojawaandGitHub 088f3fda5d Gives a prompt for people to see who is replying to an mhelp (#5963) 2018-03-19 21:27:41 -05:00
PoojawaandGitHub d6e7dcdf37 Merge branch 'master' into digileg-runtime 2018-03-17 20:16:21 -05:00
PoojawaandGitHub 31d988344a maybe actually have mentors that aren't broke as shit (#5954) 2018-03-15 20:49:32 -05:00
PoojawaandGitHub ae2541f0fb Fixes missing href on borg sleepers (#5930)
* Fixes missing href

* Update dogborg_sleeper.dm
2018-03-15 04:44:03 -05:00
PoojawaandGitHub 6784c4e6a7 Update carbon_defense.dm
I don't even know if this fixes anything but w/e
2018-03-14 18:53:57 -05:00
PoojawaandGitHub 452b58d1a1 makes traits more paranoid, also removes the double application (#5929) 2018-03-14 17:28:42 -05:00
PoojawaandGitHub 6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
PoojawaandGitHub 89b520943d copypasta fail 2018-03-11 07:47:44 -05:00
PoojawaandGitHub 9785222155 tweaks Tesla Point income (#5849)
* reigns in excessive point creep

* actually do math on this shit.
2018-03-10 07:12:24 -06:00
PoojawaandGitHub 013c908ebf Update robot.dm 2018-03-06 23:39:06 -06:00
PoojawaandGitHub 86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
PoojawaandGitHub 6e5131cfc5 Vore code to json and more (#5789)
* Vore 2.0

Initial commit

* double checked porting

* Fixes compile issues

* converts Ash Drake bellies to new system

digs out lingering datum/belly stuff too

* Let's just work on this later

* System operational

* Update preferences.dm
2018-03-06 03:59:31 -06:00
PoojawaandGitHub 0afe9eb7c3 All Maps now have Tesla as a primary engine (#5787)
* Converts all stations except Omega to Tesla Engines

* tweaks and meta fixes

* removes an exploit

* add some missing lights
2018-03-06 03:59:11 -06:00
PoojawaandGitHub 54e33374d2 Hypospray MK IIs (#5722)
* Initial commit

* most of the work down

itfinallycompiled

* tweaks

* ree

* fixes bad attempt at mode switching

* slight sprite tweak to give vials better clickability.

* can I has real review now pls thx Bhijn

* pre-emptively avoiding a troll 'review'

* WEH

* trying to code new functions is dumb

* reeeeee

put_in_hand doesn't exist apparently

and the shitty thing wants me to select mobs, not modes?

* ya lemmie just, rewrite everything

* fixes adaptation issues and sprites. Loading/unloading works

Now just to figure out reagent transfer_to code. aaaaaaaaaAAAAAAAAAAAAAAAAAAAAAAA

* HAHAHA YES

* Fully working with sounds and all.

* remove a testy boi
2018-03-06 03:56:19 -06:00
PoojawaandGitHub 61b121a4c9 Dogborg fixes, Borg construction animations! (#5725)
* major re-works

* Resting verb in, but the icons don't refresh correctly

* tweaks self heal for engiborgs

* minor fixes

* Fixes borg animation flicker

* ore pup stuff, maybe.

* tweaks from upstream input

* adds the basically useless check for dogborg specific modules

* cleans up code and Scrubpup Animation!

* Update robot_modules.dm
2018-03-04 11:53:48 -06:00
PoojawaandGitHub 3690cf3309 Oops 2018-03-01 09:39:28 -06:00
PoojawaandGitHub f7f3a600bd Removes Golem access to the station (#5692) 2018-02-26 00:20:37 -06:00
PoojawaandGitHub 4c637739a7 Applies ignore_walls = FALSE to dogborgs (#5691) 2018-02-24 08:34:23 -06:00
PoojawaandGitHub ab8ccef9b8 Missing drink icon from #5681 2018-02-24 06:13:17 -06:00
PoojawaandGitHub 743b1239bb Fixes dogborg offsets and gun layering (#5668)
* Fixes dogborg offsets.

* Fixes Dogborg laser overlays

* comment fix.
2018-02-22 23:48:24 -06:00
PoojawaandGitHub 8305efd5a1 Vore preference fix + Sounds respect wall barriers (#5623)
* various vore QoLs

* removed unused button, added the verb
2018-02-21 00:42:11 -06:00
PoojawaandGitHub 97f69d6b05 Stop the fucking posibrain pinging, christ (#5584) 2018-02-19 01:04:15 -06:00
PoojawaandGitHub f1f3905a66 Make Atmosia Lethal Again (#5577)
* Make Atmosia Lethal Again

* Update atmospherics.dm
2018-02-18 19:38:34 -06:00
PoojawaandGitHub e3fbca27c3 Code owners citadel style (#5578)
* just in case.

* added jellypeople owner

* Jay senpai, you're on the list now.

* Jay senpai, you're on the list
2018-02-18 19:37:28 -06:00
PoojawaandGitHub 8b529bcd6b Buffs door security. (#5574)
* Buffs door security.

* a n n o y i n g

* oh right, obj not wires
2018-02-18 19:20:26 -06:00
PoojawaandGitHub d154a302e1 Sergals don't actually have an extra snout layer 2018-02-18 06:49:30 -06:00
PoojawaandGitHub c0850044a7 Flightsuit Armor adjustments (#5515)
* armor tweaks

* marks the nerfs for future generations to respect.

* Modularizes values

flags are still getting trimmed tho.

* reee
2018-02-17 18:05:26 -06:00
PoojawaandGitHub 7d488e8f4c Citadel'd Maps from #5523 (#5551)
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
2018-02-17 18:04:28 -06:00