Commit Graph

18053 Commits

Author SHA1 Message Date
Putnam 00bc8dbc97 actually no 2020-01-01 15:06:37 -08:00
CameronWoof 9a54467064 Robots can now view the crew manifest 2020-01-01 14:38:46 -08:00
Putnam b69950ac2b wow good thing this was impossible to check 2020-01-01 13:47:51 -08:00
Putnam 1acb499929 moved a thing to prevent a runtime 2020-01-01 13:26:43 -08:00
Lin c836889944 Merge pull request #10370 from Hatterhat/blood-drunk-cripple-bad
blood drunk buff probably shouldnt cripple you
2020-01-01 21:21:39 +00:00
Putnam d0b1c442a0 tweaks 2020-01-01 13:15:13 -08:00
Putnam 607109e0d2 also added individual ballot gathering 2020-01-01 12:29:13 -08:00
Ghommie 37ce6e9336 honk 2020-01-01 20:47:36 +01:00
Putnam 444f862a4d Renamed the options to make clear this isn't scoring? 2020-01-01 11:37:40 -08:00
Hatterhat 200de62b8e tweaks transfer amounts, uncucks hypovials 2020-01-01 08:50:15 -06:00
kevinz000 68bc6dcc2a Update megafauna.dm 2020-01-01 02:43:43 -08:00
Putnam 96cbc2704f Made random always available. 2020-01-01 00:32:49 -08:00
Putnam bf752ab2e6 more extreme. 2020-01-01 00:30:34 -08:00
Putnam d6fece9a57 removed extended weighting on intrigue 2020-01-01 00:28:39 -08:00
Putnam 6bbdd5d576 try recent round removal again 2020-01-01 00:26:55 -08:00
Hatterhat 0374870c41 bulldogs knockback too 2020-01-01 02:04:03 -06:00
Putnam 42347fd5ea more conveyance on how the voting works 2019-12-31 23:19:39 -08:00
Putnam 9b0e27cbc3 2 minute vote time 2019-12-31 23:11:34 -08:00
Putnam 51a7c7776a 1-5 -> -2 to 2 2019-12-31 23:03:58 -08:00
kevinz000 094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Hatterhat ef36b9df75 i love democracy 2019-12-31 21:44:03 -06:00
Hatterhat 318a6812c3 manually copied tgstation#47443 2019-12-31 21:38:11 -06:00
kevinz000 ec67a38093 Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
2019-12-31 19:32:05 -08:00
kevinz000 c222ea0bb3 Merge pull request #10356 from deathride58/sprintprefs
Adds space to sprint and toggle sprint as preferences
2019-12-31 19:29:47 -08:00
kevinz000 1051d99fdf Merge pull request #10361 from CameronWoof/fashion-ghosts
Ghost Cafe patrons now spawn with chameleon kits
2019-12-31 19:28:55 -08:00
Seris02 551e9f540d yee 2020-01-01 10:54:56 +08:00
CameronWoof 58e50de434 grampa ghommles doesn't like kids and their newfangled technology and also the VA denied his claim and now he hates bureaucracy 2019-12-31 17:44:18 -08:00
Putnam 850a407cf4 majority judgement time 2019-12-31 16:37:33 -08:00
Lin b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
Putnam 67fcdeebb3 Made loading saved votes not automatic 2019-12-31 12:43:37 -08:00
r4d6 dc2f9f2289 Revert "Merge branch 'master' of https://github.com/r4d6/Citadel-Station-13"
This reverts commit 95c96ed99c, reversing
changes made to a3ee3fe826.
2019-12-31 13:20:41 -05:00
r4d6 12a01d1656 update (#9)
* Minor underwear fixes and tweaks.

* Allows ghost mentors to orbit around the target instead of changing their view to the mob's.

* Ports some hud and update_icon code updates.

* contamination nerf

* Fix

* Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.

* Hello darkness my old friend.

* Ports "Refactors can_see_reagents"

* F

* MKUltra made double opt-in

* ROBUST OPTING MECHANICS

* Adds a hacky framework for digitigrade polyclothes

also adds a digitigrade state for polychromic shorts

* also adds aphrodisiacs, slaps, all hypno as prefs

* errors

* Modernizes Polychromic Uniform Code

No more modular_citadel, but the neck polychrome crap needs more work in another PR

* oh god please don't mess up

* git y u do dis

;-;

* Revert "Makes HE pipes realistically radiate away heat"

* more coat stuff yes yes

* woops

* Wew

* Steos are bad

* new wings and fluff

* Forgot a sprite

* another one

* I swear I had this in here orginally.

* Fixes mistake in less commit.

* reattaches missing antenna

* Effectively removes the long unrequired roboticist encryption key.

* updates ratvar coat

* magazine metal cost tweaks, speedloader in AIB

* the very shitty idea: "muh speedloader"

* Updating dynamic config, some balancing

* Automatic changelog generation for PR #10282 [ci skip]

* unfucks short hair 80s so the left facing sprite doesnt make you look like a crackhead

* Automatic changelog generation for PR #10266 [ci skip]

* ah, the wonders of atomization

* [s] fixes a little door assembly glass dupe exploit

* Update BoxStation.dmm

* Update pai_defense.dm

* fixes bad sprite states

* Automatic changelog generation for PR #10242 [ci skip]

* Automatic changelog generation for PR #10237 [ci skip]

* Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.

* holy shit i hope this compiles

* e

* yee

* Automatic changelog generation for PR #10128 [ci skip]

* Nope, it didn't compile, Harold.

* Automatic changelog generation for PR #10283 [ci skip]

* Automatic changelog generation for PR #10281 [ci skip]

* Automatic changelog generation for PR #10250 [ci skip]

* Applied suggestions and minor tweaks.

* f

* yeah fair enough

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update engine_goggles.dm

* changes

* Automatic changelog generation for PR #10264 [ci skip]

* Automatic changelog generation for PR #10298 [ci skip]

* Good idea, tbh.

* Small touch-up.

* Nerfs armor and antistun

* Automatic changelog generation for PR #10296 [ci skip]

* let the adminbus commence

* sprites

* clothing add

* fix

* vending

* loadout

* FIXEdD

* Automatic changelog generation for PR #10265 [ci skip]

* Automatic changelog generation for PR #10289 [ci skip]

* Automatic changelog generation for PR #10268 [ci skip]

* Update CentCom.dmm

* ehh fine but why would you use this proc for that

* Update language_holder.dm

* Automatic changelog generation for PR #10315 [ci skip]

* cocooooonuuuuuuts

* excludes certain ghost roles from being affected by health events

* fixes the thing

* probably fixes pandoras attacking their owners

* Update stamina.dm

* Update sprint.dm

* Update food_reagents.dm

* Automatic changelog generation for PR #10322 [ci skip]

* does the fix?

* What about this?

* Wait no its actually the other way around.

* weh

* Automatic changelog generation for PR #10297 [ci skip]

* Automatic changelog generation for PR #10299 [ci skip]

* more weh.

* even more weh.

* all of the weh.

* ah

* Automatic changelog generation for PR #10217 [ci skip]

* maybe fixes?

* Don't use named arguments on new, please.

* Made a line use the dang macro

* Made sure ghost cafe visitors don't get midround antags

* Automatic changelog generation for PR #10328 [ci skip]

* Physiology so species changes dont fuck it up

* Whoops

* Aarggghh small fucking differences

* Makes ass slap attempts fail more loudly on opted-out mobs

* Automatic changelog generation for PR #10318 [ci skip]

* Automatic changelog generation for PR #10091 [ci skip]

* Update borghydro.dm

* Update grass_carpet.dm

* Ports reflector blobs

Ports reflectors from /TG/

* mouth

* Fixes UI for poly collars

AltClick for collars was seemingly forgotten so I've added it back

* auto ooc

* roundend too

* hnnnnnng code improvements

* marshmallow

* telescopic IVs

* tiny fix

* Automatic changelog generation for PR #10324 [ci skip]

* Automatic changelog generation for PR #10323 [ci skip]

* Update code/modules/hydroponics/grown/grass_carpet.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* got it

* Update engine_goggles.dm

* [s] Fixes ghost anti-ghostrole timers a little.

* chestbursters deleting brains fix.

* Wait a minute...

* ...which var are you?

* Update belt.dm

* tiny fixes

* makes it a trait

* few fixes

* wow divide by 0 very cool

* Automatic changelog generation for PR #10095 [ci skip]

* Automatic changelog generation for PR #10312 [ci skip]

* Automatic changelog generation for PR #10243 [ci skip]

* Automatic changelog generation for PR #10336 [ci skip]

* Automatic changelog generation for PR #10335 [ci skip]

* Automatic changelog generation for PR #10334 [ci skip]

* Automatic changelog generation for PR #10239 [ci skip]

* Automatic changelog generation for PR #10168 [ci skip]

* Automatic changelog generation for PR #10331 [ci skip]

* Automatic changelog generation for PR #10320 [ci skip]

* Maybe he means this?

* CE Locker Exodus: The Removaling

Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.

* ok

* Automatic changelog generation for PR #10348 [ci skip]

* Automatic changelog generation for PR #10333 [ci skip]

* changelog.html

* desc

* hnnnng

* weh

* did this actually change anything

* Automatic changelog generation for PR #10337 [ci skip]

* yee.

* yee2.

* Automatic changelog generation for PR #10339 [ci skip]

* Ghommies fixes

* Automatic changelog generation for PR #10306 [ci skip]

* amazing.

* Automatic changelog generation for PR #10357 [ci skip]

* Automatic changelog generation for PR #10301 [ci skip]

* Update chem_master.dm

* Automatic changelog generation for PR #10123 [ci skip]

* Automatic changelog generation for PR #10165 [ci skip]

* Automatic changelog generation for PR #10338 [ci skip]

* Automatic changelog generation for PR #10344 [ci skip]

* Oh god oh fuck

* Update code/modules/hydroponics/seeds.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/hydroponics/seeds.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/hydroponics/gene_modder.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update telescopic_iv.dm

* Automatic changelog generation for PR #10364 [ci skip]

* afwafwadjiwao

* Automatic changelog generation for PR #10365 [ci skip]

* Automatic changelog generation for PR #10319 [ci skip]

* Automatic changelog generation for PR #10345 [ci skip]

* Automatic changelog generation for PR #10362 [ci skip]

* Automatic changelog generation for PR #10309 [ci skip]

* Makes lockers into subtypes

Adds new lockers cleanly at the bottom instead and as subtypes.

* dab

* dab 2x

* Automatic changelog generation for PR #10349 [ci skip]

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com>
Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Co-authored-by: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com>
Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
Co-authored-by: Detective-Google <48196179+Detective-Google@users.noreply.github.com>
Co-authored-by: LetterJay <9606363+LetterJay@users.noreply.github.com>
Co-authored-by: Lin <linzolle@gmail.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: kappa-sama <44128284+kappa-sama@users.noreply.github.com>
Co-authored-by: Arturlang <arturpaavooskari.lang@gmail.com>
Co-authored-by: loginsandylogout <nintendofan356@gmail.com>
Co-authored-by: BlackMajor <henrydyer6@hotmail.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
Co-authored-by: nik707 <38332985+nik707@users.noreply.github.com>
2019-12-31 13:12:23 -05:00
kevinz000 f920e7b73c changes 2019-12-31 10:08:14 -08:00
Ghom cba4bc27ef Merge pull request #10349 from KathrinBailey/CE-locker
CE Locker Vengeance: The Removaling + Welding locker consistency changes + Empty lockers for mappers
2019-12-31 18:01:23 +01:00
KathrinBailey 243aebe12a dab 2x 2019-12-31 16:54:59 +00:00
KathrinBailey 0a19f62fa9 dab 2019-12-31 16:45:06 +00:00
KathrinBailey f2e9ba2a8e Makes lockers into subtypes
Adds new lockers cleanly at the bottom instead and as subtypes.
2019-12-31 16:41:23 +00:00
Ghommie 99c3358d61 Fixing a whacky female clothing caching related issue. 2019-12-31 17:13:01 +01:00
Ghom 93e090d229 Merge pull request #10309 from Seris02/disablerglasses
disabler sechuds, let the adminbus commence
2019-12-31 14:43:39 +01:00
Ghom 4660465115 Merge pull request #10362 from Trilbyspaceclone/patch-258
Corrects bottle/pill/patch/condiments "#$39;"
2019-12-31 14:39:34 +01:00
Ghom 0453363d4c Merge pull request #10345 from Trilbyspaceclone/patch-256
Buffs bandoliers to hold more types of casings.
2019-12-31 14:36:53 +01:00
Ghom 78e4c608ad Merge pull request #10319 from Seris02/coconutsyep
porting azarak's coconuts from hyper station
2019-12-31 13:16:07 +01:00
Putnam cf77f7b18e Balance pass (see description)
1. Made bloodsuckers more likely on calm, story, slightly more common on intrigue
2. Made intrigue no longer have low threat by default
3. Made abductors have lower weights in general, making them less likely to show up
4. Made sentient disease, revenant less likely on calm
5. Added a new storyteller, "Conversion", which rolls conversion antags.
2019-12-31 02:40:50 -08:00
BlackMajor 8085022d97 Couple of changes. Starting on the point bank. 2019-12-31 23:28:30 +13:00
Trilbyspaceclone c81d0e8b66 Update energy.dm 2019-12-31 05:25:12 -05:00
Hatterhat 5a497b02ac hey i'm WALKIN here 2019-12-31 01:56:01 -06:00
kappa-sama c0bc53ea81 more 2019-12-31 01:43:42 -05:00
kappa-sama 970814adbc it begins 2019-12-31 01:42:07 -05:00
Hatterhat 76e789d3d1 getting limb crippled is a 4head bruh 2019-12-31 00:14:52 -06:00
Hatterhat 4c5f6f895b tgstation 42481 2019-12-31 00:07:36 -06:00