Commit Graph

27623 Commits

Author SHA1 Message Date
r4d6
91a8a434f5 Fix a bug and allow for the three crystals to be hit. 2020-01-02 01:58:34 -05:00
r4d6
0fad4aff75 change a x of place to make more sense. 2020-01-02 01:34:17 -05:00
r4d6
4010d72b7a Add 3 SM Variations 2020-01-02 01:31:21 -05: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
95c96ed99c Merge branch 'master' of https://github.com/r4d6/Citadel-Station-13 2019-12-31 13:20:25 -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
CitadelStationBot
a3ee3fe826 Automatic changelog generation for PR #10349 [ci skip] 2019-12-31 11:01:26 -06: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
CitadelStationBot
98e9196cfe Automatic changelog generation for PR #10309 [ci skip] 2019-12-31 07:43:42 -06:00
Ghom
93e090d229 Merge pull request #10309 from Seris02/disablerglasses
disabler sechuds, let the adminbus commence
2019-12-31 14:43:39 +01:00
CitadelStationBot
c25605f7e6 Automatic changelog generation for PR #10362 [ci skip] 2019-12-31 07:39:37 -06: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
CitadelStationBot
4349371b0b Automatic changelog generation for PR #10345 [ci skip] 2019-12-31 07:36:56 -06: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
CitadelStationBot
3589803caf Automatic changelog generation for PR #10319 [ci skip] 2019-12-31 06:16:10 -06: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
CitadelStationBot
8ac23f41e6 Automatic changelog generation for PR #10365 [ci skip] 2019-12-30 22:12:58 -06:00
Lin
b3144c7570 Merge pull request #10365 from Putnam3145/fix-prefs
[s] prefs broke i fix
2019-12-31 04:12:55 +00:00
Putnam
0b60b121c2 afwafwadjiwao 2019-12-30 19:34:57 -08:00
CitadelStationBot
5f9666d866 Automatic changelog generation for PR #10364 [ci skip] 2019-12-30 20:10:32 -06:00
Putnam3145
1fc7722421 Merge pull request #10364 from Citadel-Station-13/kevinz000-patch-3-1
telescopic iv drips are no longer bluespace magic
2019-12-30 18:10:30 -08:00
kevinz000
79c609aa40 Update telescopic_iv.dm 2019-12-30 17:55:59 -08:00
nik707
bcaaaba396 Merge pull request #10363 from Arturlang/patch-4
[s] Fixes bloodsucker mindshield thralling
2019-12-30 19:34:38 -06:00
Seris02
46c68f8fd8 Update code/modules/hydroponics/gene_modder.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-31 09:34:22 +08:00
Seris02
2e8c671a2f Update code/modules/hydroponics/seeds.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-31 09:34:15 +08:00
Seris02
5e403dd0a7 Update code/modules/hydroponics/seeds.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-31 09:34:03 +08:00
Arturlang
c4caa54608 Oh god oh fuck 2019-12-31 03:23:14 +02:00
CitadelStationBot
d2027c9abf Automatic changelog generation for PR #10344 [ci skip] 2019-12-30 18:31:37 -06:00
nik707
70d03a7870 Merge pull request #10344 from Ghommie/Ghommie-cit495
chestbursters deleting brains fix.
2019-12-30 18:31:34 -06:00
CitadelStationBot
9538b7e664 Automatic changelog generation for PR #10338 [ci skip] 2019-12-30 18:31:09 -06:00
nik707
5c13fa64e3 Merge pull request #10338 from Seris02/marshmallow
marshmallow
2019-12-30 18:31:06 -06:00
CitadelStationBot
2271246910 Automatic changelog generation for PR #10165 [ci skip] 2019-12-30 18:28:51 -06:00
nik707
8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456
Minor underwear fixes and tweaks.
2019-12-30 18:28:48 -06:00
CitadelStationBot
8fb817b8f2 Automatic changelog generation for PR #10123 [ci skip] 2019-12-30 18:28:19 -06:00
nik707
23f79ffed8 Merge pull request #10123 from Citadel-Station-13/throwing_disarm_stuff
throwing now only randomly turns things if you are on harm intent
2019-12-30 18:28:16 -06:00
Trilbyspaceclone
ea43069222 Update chem_master.dm 2019-12-30 18:05:34 -05:00
CitadelStationBot
9cd2385e5c Automatic changelog generation for PR #10301 [ci skip] 2019-12-30 15:23:49 -06:00
Ghom
775ddb61e6 Merge pull request #10301 from Trilbyspaceclone/patch-249
Buffs Engine Goggles a lot!
2019-12-30 22:23:46 +01:00
CitadelStationBot
310de3b8cc Automatic changelog generation for PR #10357 [ci skip] 2019-12-30 14:46:41 -06:00
Ghom
e5cf7430fa Merge pull request #10357 from Putnam3145/fix-prefs
Fixes prefs
2019-12-30 21:46:38 +01:00
Putnam
d78ebd15f3 amazing. 2019-12-30 12:38:38 -08:00
CitadelStationBot
2a893caa30 Automatic changelog generation for PR #10306 [ci skip] 2019-12-30 13:11:36 -06:00
Ghom
d3bf4bbb8c Merge pull request #10306 from Arturlang/patch-2
Removes most of vampire armor and removes stun scaling, and associates the buffs with physiology
2019-12-30 20:11:34 +01:00
Arturlang
0776cade21 Ghommies fixes 2019-12-30 20:18:49 +02:00
CitadelStationBot
f8296b53cb Automatic changelog generation for PR #10339 [ci skip] 2019-12-30 11:24:53 -06:00
Ghom
e309497af2 Merge pull request #10339 from Seris02/teleivdrip
telescopic IV drips
2019-12-30 18:24:50 +01:00
Seris02
f0ba93052d yee2. 2019-12-30 23:53:10 +08:00