a4a0295312
ok
2020-06-07 21:27:36 -07:00
495ccc99c5
Porting some cargo/vending updates.
2020-06-08 06:12:51 +02:00
8ba5c8f690
Merge pull request #12444 from shellspeed1/Makes-internal-tanks-printable
...
Makes internal tanks printable at the engineering lathe
2020-06-08 00:37:26 +02:00
8b406df1ec
mk III
2020-06-05 22:43:49 -04:00
6ad72e6972
better limb healing
2020-06-05 15:41:52 +01:00
92d1af5889
adjustments
2020-06-04 22:18:19 -07:00
a35fce64e2
fixes
2020-06-04 20:02:59 -07:00
bad809ffce
fixes
2020-06-04 19:56:06 -07:00
a2c4b741ad
ahaha what if they didnt heal?
2020-06-04 21:46:38 -04:00
2002a273de
Makes empty internal tanks printable
2020-06-04 16:04:16 -07:00
6db076c42f
Lowers the slowdown on snow tiles ( #12404 )
...
* Update fancy_floor.dm
* Update fancy_floor.dm
2020-06-04 15:52:30 -07:00
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
5e37d3ef3b
Merge pull request #12430 from Ghommie/Ghommie-cit811
...
Fixing various icons problems with some clothings.
2020-06-03 20:23:16 +00:00
1a9787a9c2
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-06-02 21:49:43 -07:00
b62ef0f4e8
right...
2020-06-02 19:44:47 -04:00
575609ca8a
Fixing my fix for reclyclers. ( #12422 )
...
* Fixing my bad fix for the recycler.
* rework.
* Ok
2020-06-02 15:29:32 -07:00
d7954ca077
Yet another PR fixing some issues. ( #12424 )
2020-06-02 15:29:01 -07:00
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
07e42c079c
Fixing cards states and user-less projectiles checking mean armor values. ( #12400 )
2020-06-02 15:24:13 -07:00
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
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
916a1ab349
Update objective_items.dm ( #12420 )
2020-06-02 23:37:05 +02:00
1a9484cf2e
Fixing missing clothing icons etc.
2020-06-02 17:43:31 +02:00
8c5005d572
Vrsleeper works, linkage for art and bepis
2020-06-01 19:15:19 +03:00
85a1d0f957
VrSleeper(WIP) and hypnochair
2020-06-01 12:47:37 +03:00
e80cee9b4c
Merge pull request #12406 from Citadel-Station-13/Ghommie-patch-1
...
Fixing holodeck bedsheet magic in a better fashion.
2020-06-01 01:21:20 +00:00
8e26876634
Makes Spears rational. ( #12401 )
...
* hate spears, hate elances, hate embedding.
* Update code/game/objects/items/twohanded.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/game/objects/items/twohanded.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/game/objects/items/twohanded.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/game/objects/items/twohanded.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-06-01 01:44:31 +02:00
1fc73700c5
Telecomms TGUI ( #12145 )
...
* aaaaaa
* branch hell
* time to sync
* build
* adds more """functionality""" for telemonitor
* messaging pda thing
* bakes tgui
* someone didn't finish the code for req. consoles
* go use [TELECOMM STUFF].on, it's better
* build stuff
* a
* interface for teleinteraction
* tgui
* ready for launch - not tested yet
* build
* built ui
* bitflag readability and bye oldcode!
* bepis
* build ui
2020-06-01 00:22:40 +02:00
b7411bf9a0
Fix The X-01 Multiphase energy gun box ( #12409 )
...
Fix /obj/item/storage/secure/briefcase/hos/multiphase_box/PopulateContents()
2020-05-31 13:50:31 +02:00
151df41d1c
asset cache + better minimaps
2020-05-31 16:15:09 +08:00
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
5b6e797c4f
desword adjustments
2020-05-30 23:43:05 -07:00
34d8aa0ee9
refactor
2020-05-30 23:13:16 -07:00
2232271ea5
fixes and render
2020-05-30 22:29:41 -07:00
1fef5825a9
definition fixes
2020-05-30 22:09:13 -07:00
d47841ee54
documentation
2020-05-30 20:38:07 -07:00
588443e928
fix
2020-05-30 20:12:50 -07:00
e5c32c1746
changes
2020-05-30 20:11:18 -07:00
bfd23bec04
That won't help us.
2020-05-31 01:50:17 +02:00
effd1b0158
Fixing bedsheet magic in a better fashion.
2020-05-31 01:46:16 +02:00
25dbed5b0b
Made the decal component an element. ( #12388 )
...
* Made the decal component an element.
* Is this really worth it?
* Oh.
2020-05-30 14:06:53 -07:00
f572fe4607
Revert "Framework for (hopefully) reducing memory usage by replacing thousands of decals with turfs that look visually identical ( #12383 )" ( #12387 )
...
This reverts commit ab86d669a7
2020-05-30 14:06:38 -07:00
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
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
9d4d6e6b6f
your goddamn ass isn't a constant expression
2020-05-30 02:12:49 -07:00
519552cb78
more handling
2020-05-30 01:59:58 -07:00
1214c99a34
is this a good idea
2020-05-30 01:46:43 -07:00
b74d465b6c
fix
2020-05-30 01:22:09 -07:00
05fe0c7dcc
ok
2020-05-30 00:59:29 -07:00
f8741b6a0b
adjust
2020-05-29 19:50:11 -07:00
kevinz000