Commit Graph

18777 Commits

Author SHA1 Message Date
Yawet330 fabfd684ce Silicon Flavortexts. (SCRUTINISE HEAVILY) (#12395)
* Part 1 - Adding the component

* Part 2 - Making the WRITE_FILE before changing the pref menu.

* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction

* Part 4 - Changes the preference tab to accomodate this.

* we made a brief fucky wucky!

* make it look noice

* fuckywucky mk2

* Part 5 - make it apart of the helper list (woops)

* that'yll do it.

* maybe fix?

* nope, just hit the delete button on their flavortext entirely :agony:

* Update preferences_savefile.dm

* Update silicon.dm

* Update preferences.dm

* Update silicon.dm
2020-06-04 15:53:39 -07:00
DeltaFire15 0dc57a5a96 Powers Reimagined : Void Volt (#12433)
* Void volt try 2 : Conflict boogaloo

This time with a new branch because >conflicts

* changes up some stuff

some modifications & fixes for void volt while also reorginasing the scripture tier scriptures a bit.

* Tweaks, fixes and changes

After a fuckton of localtesting, I changed around some values / fixed some stuff so it should be fine to have.

* haha yeah uh better not leave that one debug message in

oops!
2020-06-04 15:41:01 -07:00
deathride58 3eb3934e26 Adds Pride Month as a holiday! (#12436)
* Adds pride month as a holiday, complete with assistants spawning with rainbow jumpsuits

* yknow what, while i'm at it, let's compress it
2020-06-04 15:40:31 -07:00
DeltaFire 1a6bfeb0f1 Switch man bad
ifs in switch segments ONLY support constant expressions, NOT vars
2020-06-04 18:32:41 +02:00
Timothy Teakettle 1406364889 fix emps 2020-06-04 15:25:56 +01:00
Timothy Teakettle b54cc8de3c fix indentation 2020-06-04 15:09:14 +01:00
Timothy Teakettle f2aa370506 make ipcs cool 2020-06-04 14:59:52 +01:00
Trilbyspaceclone d1a80ca2d7 Ghommie requested change 2020-06-03 20:29:17 -04:00
Lin 5e37d3ef3b Merge pull request #12430 from Ghommie/Ghommie-cit811
Fixing various icons problems with some clothings.
2020-06-03 20:23:16 +00:00
kevinz000 1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
TrilbySpaceClone 937731d77d fix and tested 2020-06-02 21:32:36 -04:00
TrilbySpaceClone b62ef0f4e8 right... 2020-06-02 19:44:47 -04:00
Ghom d53dca7322 Fixing just a couple issues. (#12417) 2020-06-02 15:30:22 -07:00
ynot01 ab3799ae7a Ports cornrows hairstyles from yogstation (#12423) 2020-06-02 15:29:07 -07:00
Ghom d7954ca077 Yet another PR fixing some issues. (#12424) 2020-06-02 15:29:01 -07:00
TheObserver-sys 0d55a387d0 Powers Remembered: Chants (#12403)
* Initial Commit: Inath-Neq's Mantra

* A Volt of Inspiration

* Bug Squash I

* Bugsquashing II

* Bugsquashing III - Now with effects added!

* Bugsquashing IV: This probably won't work!

* It worked, how about that. Numbers Tweak.

* Better Number Tweaks

Co-authored-by: The0bserver <Gizmomaster777@gmail.com>
2020-06-02 15:27:13 -07:00
Ghom 07e42c079c Fixing cards states and user-less projectiles checking mean armor values. (#12400) 2020-06-02 15:24:13 -07:00
Ghom ea763df326 Photosynthesis element. (#12394)
* Photosynthesis element.

* element yaketi sax.

* Ok, let's just use SSobj which has 20 wait instead of 10.
2020-06-02 15:23:09 -07:00
Ghom a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
2020-06-02 15:22:06 -07:00
Ghom 1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
2020-06-02 23:48:50 +02:00
Ghommie 1a9484cf2e Fixing missing clothing icons etc. 2020-06-02 17:43:31 +02:00
coldud13 17d4c99b25 alt click to remove containers from reagent grinder and biogenerator 2020-06-02 19:10:41 +10:00
Letter N 8122c7b35d Update code/modules/mapping/minimaps.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-02 11:54:03 +08:00
kevinz000 effa47ec93 Update projectile.dm (#12380) 2020-06-01 21:46:02 +02:00
Artur 8c5005d572 Vrsleeper works, linkage for art and bepis 2020-06-01 19:15:19 +03:00
Artur 85a1d0f957 VrSleeper(WIP) and hypnochair 2020-06-01 12:47:37 +03:00
DeltaFire b98f2532d5 little thing 2020-05-31 20:25:21 +02:00
DeltaFire bb7a2c43a8 First of many changes
Adds the possibility for stationside clockwork obelisks to create stable gateways with unlimited uses, linking between the station and reebe. The gateway scripture no longer can teleport cultists from or to reebe. Spatial gateway from obelisks still works, but it is FAR less power efficient.
These gateways are closed via either hitting them with a nullrod, destroying their obelisk, or a cultist initiating their close sequence via a 80ds doafter with the slab used on the gateway.
2020-05-31 20:23:57 +02:00
Lin 348885a58d Merge pull request #12382 from Ghommie/Ghommie-cit797
Slight simple mob boss improvements.
2020-05-31 15:22:23 +00:00
Ghommie 2f3fd48b84 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-05-31 16:08:52 +02:00
Letter N 151df41d1c asset cache + better minimaps 2020-05-31 16:15:09 +08:00
Ghom 48b327ea74 chemistry/bio bags nerf and little pill volumetric tweak. (#12392)
* chemistry bag nerf and little pill volumetric tweak.

* Yea, sure why not?

* hey.

* Kevinz review.
2020-05-31 00:54:28 -07:00
kevinz000 abc2b820a4 Update living_blocking_parrying.dm 2020-05-30 23:49:04 -07:00
kevinz000 faf65ae2b5 Merge branch 'combat_rework' of github.com-kevinz000:kevinz000/Citadel-Station-13 into combat_rework 2020-05-30 23:46:34 -07:00
kevinz000 5b6e797c4f desword adjustments 2020-05-30 23:43:05 -07:00
kevinz000 250d078596 that was easy 2020-05-30 23:14:02 -07:00
kevinz000 34d8aa0ee9 refactor 2020-05-30 23:13:16 -07:00
kevinz000 d832cb6526 fix 2020-05-30 22:43:23 -07:00
kevinz000 2232271ea5 fixes and render 2020-05-30 22:29:41 -07:00
kevinz000 1fef5825a9 definition fixes 2020-05-30 22:09:13 -07:00
kevinz000 c613726c2a render 2020-05-30 22:05:19 -07:00
kevinz000 e6020ca22c variable render 2020-05-30 21:02:13 -07:00
kevinz000 0723399ed4 render 2020-05-30 20:55:33 -07:00
kevinz000 d47841ee54 documentation 2020-05-30 20:38:07 -07:00
kevinz000 e5c32c1746 changes 2020-05-30 20:11:18 -07:00
kevinz000 502873cb7c Delete bindings_living.dm 2020-05-30 18:19:39 -07:00
kevinz000 4a971a223c Delete bindings_mob.dm 2020-05-30 18:19:04 -07:00
Letter N af1aa9758d matrix and orbit thing (#12399) 2020-05-31 02:20:20 +02:00
Ghommie 9a9e76664f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 22:47:13 +02:00
Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00