95b8cd3956
first port
2020-06-10 20:33:01 +01:00
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
907d909861
Merge pull request #12493 from DeltaFire15/eldritch-affairs-exploit-fix
...
[s] xenobio golems can no longer be used to exploit eldritch affairs mechanics
2020-06-09 02:22:04 +02:00
e2466f1e22
tiny bit of better performance
2020-06-08 21:29:29 +02:00
c29be22f9b
no more gamer time
2020-06-08 19:06:41 +02:00
1e3fd46c2d
Merge pull request #12472 from Citadel-Station-13/kevinz000-patch-9
...
makes default photosynthesis MUCH less punishing
2020-06-08 11:25:15 -05:00
f3af445c94
Update material_container.dm ( #12491 )
2020-06-08 09:09:53 -07:00
9e19c0bb17
AAAAAA
2020-06-08 08:19:47 +02:00
ad6b835e8b
Linter.
2020-06-08 08:12:29 +02:00
a4a0295312
ok
2020-06-07 21:27:36 -07:00
495ccc99c5
Porting some cargo/vending updates.
2020-06-08 06:12:51 +02:00
5b863e7e9b
Update photosynthesis.dm
2020-06-07 03:43:41 -07:00
6f62cb8678
Update photosynthesis.dm
2020-06-07 03:40:34 -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
d53dca7322
Fixing just a couple issues. ( #12417 )
2020-06-02 15:30:22 -07:00
f926dd7f5e
Update pockets.dm ( #12421 )
2020-06-02 15:29:51 -07:00
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
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
1a9484cf2e
Fixing missing clothing icons etc.
2020-06-02 17:43:31 +02:00
597432424c
Buffs lunging gloves a bit, so they arent a detriment to the user as much ( #12336 )
...
* Buffs leap all around
* Kev suggestions
* Im stoopid
2020-06-01 21:51:41 +02:00
40e54650c7
Compile
2020-06-01 10:26:48 +03:00
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
151df41d1c
asset cache + better minimaps
2020-05-31 16:15:09 +08:00
2232271ea5
fixes and render
2020-05-30 22:29:41 -07:00
af1aa9758d
matrix and orbit thing ( #12399 )
2020-05-31 02:20:20 +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
949e8f6b3a
WIP
2020-05-30 21:53:14 +02:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
745695e60d
WIP, js tiring.
2020-05-30 15:55:16 +02:00
4b19e5863e
cooldown
2020-05-30 06:16:34 -03:00
65bb3bbb91
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-29 19:13:22 -07:00
1bca74465f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 03:29:02 +02:00
e51ac4e745
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-05-29 17:58:35 +02:00
ff51c9d2db
Improvised Weapons Update: Part 1 ( #12226 )
...
* Improvised Weapons Part 1: Shotgun & Rifle
Adds new sprites for ammo, the improvised rifle, the improvised shotgun. Adds a hand saw. Adds things to the crafting menu. Adds things to the autolathe menu.
* PR not yet ready - just cleaning issues.
Just trying to remark some of the issues resolved so I can see where I'm at a bit easier.
* Reverting changes to shotgun ammo names in the autolathe.
No point calling it 12G when there's no 20G anymore.
* Weapon weight + sprite improvements.
Makes sprites for gun parts bulkier with a low alpha pixel outline to make them easier to click on. They also look a bit closer to what their final product will be.
* oops forgot the "
* Revert "Merge branch 'master' into Improvised-Part-1"
This reverts commit 1e43d228d1bc35b0582244ed0bd91934573b3cdd, reversing
changes made to 207e9fccd4e8cffbe9ed26401a6f516fc44245dd.
* Revert "Revert "Merge branch 'master' into Improvised-Part-1""
This reverts commit 22d421d010c4a4c5c5e26f49fe6bffcf6198df42.
* My Github or environment isn't flipping out. no more.
Derp. Also projectile damage modifier fixed. I can actually compile without hundreds of errors.
* Made small weapon parts have w_class small.
I was testing it out and seeing the trigger assembly take so much space in my inventory seemed really odd.
* Duplicate definition refused.
Hurrdurr I suck.
Glad I gave this a quick look-voer.
Shotgun description edited to reflect the 0.8x damage modifier.
* Resolved tools.dmi merge conflict.
Just took the dmi from master and put the new sprites on at the end.
* DNM - Trying to see why usptream tools.dmi with my stuff added on the end is conflicting.
* Please don't conflict
2020-05-28 23:24:42 -07:00
03ee37bb06
let's finish parrying
2020-05-28 04:55:43 -07:00
cea958f822
Fixing various issues. ( #12368 )
...
* Fixing various issues.
* Lights.
2020-05-28 00:36:57 -07:00
162e79df23
fixes dreamchecker errors
2020-05-27 18:17:00 -07:00
433bd1af79
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-27 18:11:15 -07:00
16dea7ceed
Revamped the paper wizard robes. ( #12348 )
...
* Better paper wizard robes.
* return value.
* ooo
* Aaa
* aaaa
2020-05-27 18:01:22 -07:00
968426fd48
Combat mode component. ( #12338 )
...
* Combat mode component.
* Whoops.
* test.
* Oh
* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
93a168d8a8
updates dmapi from dmapi 5.1.0 to dmapi 5.2.1 (based off tgstation/tgstation#51100 ) ( #12364 )
2020-05-27 17:58:43 -07:00
d88c815845
vars ( #12373 )
2020-05-28 01:18:26 +02:00
1b8e05875f
Merge pull request #12357 from Citadel-Station-13/Ghommie-patch-1
...
quick tactical fix.
2020-05-26 17:13:32 +00:00
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
d04d6ae9eb
WIP
2020-05-25 15:06:31 +02:00
8fd8b6a0bb
Update tactical.dm
2020-05-25 11:16:51 +02:00
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
ad57647e64
Merge pull request #12173 from kevinz000/projectiles_2
...
Refactors projectile speed to pixels per second
2020-05-24 21:21:41 +00:00
ce1f1bdf5e
Turning a few components into elements. ( #12325 )
...
* Turning a few components into elements.
* eh
2020-05-24 13:06:27 -07:00
Timothy Teakettle