Commit Graph

216 Commits

Author SHA1 Message Date
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
2020-06-17 20:10:04 -07:00
Timothy Teakettle
2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
Artur
92a60d6e68 Makes it actually work 2020-06-17 17:37:03 +03:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/

* Recipes fix
2020-06-16 16:22:56 -07:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Timothy Teakettle
95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Timothy Teakettle
14c9ab2ff1 ports tgs regal rats (#12479)
* port regal rats

* fix missing line

* royal rat goes after humans too

* okay dont let them attack people

* let them attack people but at less damage

* remove header
2020-06-09 03:28:00 -07:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
KathrinBailey
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
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
kevinz000
b57e1c1e93 Rebindable Hotkeys (#12138)
* demodularize interface

* keybindings

* binds

* prefs

* loose ends

* globals

* changes

* s

* datum ref lists

* ok

* fixes

* fixes

* fix

* ok

* sigh

* sigh

* indicators

* let's play the move code around game

* let's play the i didn't comma my lists game

* let's play the indent game

* let's play hte spelling bee

* let's fail the spelling bee

* LET'S PLAY THe HOW HARd  IS  IT TO SPELL A PROC GAME

* let's play the bugfix game

* bugfixes

* improvements

* Update bindings_client.dm

* pixel shift

* A

* wups
2020-05-20 23:40:20 +02:00
Artur
dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Ghommie
cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-01 22:12:00 +02:00
kevinz000
2335fd3ca6 kay (#12060) 2020-05-01 17:57:53 +02:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie
58fc679cce WIP 2020-04-24 20:49:15 +02:00
Artur
67e0b95407 Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/ 2020-04-23 12:36:42 +03:00
Ghommie
01f444b761 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-21 20:45:58 +02:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
Ghommie
c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghommie
3bef4b88ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-20 02:29:34 +02:00
kevinz000
ab01d91971 Merge pull request #11903 from Ghommie/Ghommie-cit687
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 19:32:50 -07:00
Ghommie
523672b6a5 fix for my relatively minuscule backend refactor for holodeck. 2020-04-18 02:32:10 +02:00
Ghommie
87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-17 21:57:21 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghommie
586966ea51 General refactor for some snowflake bodyparts procs and taurs. 2020-04-16 03:37:52 +02:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Trilbyspaceclone
5833ed8029 Merge branch 'master' into tools_andstuff 2020-04-14 10:10:32 -04:00
Ghommie
983f369357 Little Holodeck refactor. 2020-04-12 01:49:25 +02:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
TrilbySpaceClone
1f51e73dd6 more rng 2020-04-07 08:43:18 -04:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
keronshb
7e1e905a95 Line ending changes, I hope
here goes nothing.
2020-03-08 20:36:05 -04:00
keronshb
0d3da4fcc0 maybe? last go? 2
Should be the final part I hope
2020-03-08 20:11:13 -04:00
keronshb
94958581b9 maybe? last go?
maybe? last go?
2020-03-08 20:10:34 -04:00
keronshb
d460f5359e Hopefully this will fix it?
Hopefully this will fix it?
2020-03-08 18:49:18 -04:00
keronshb
9b63c7aa11 Trying to see if this will fix the line end issue
Trying to see if this will fix the line end issue
2020-03-08 18:48:42 -04:00
keronshb
228012c718 Blob refactor (#43872)
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
Kraseo
e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
Ghommie
2b740f9bad [s] Fixing an issue with slot machines crashing the server. 2020-02-23 13:09:21 +01:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
d2398f4584 Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2
Porting agent card updates and registered name fix.
2020-02-15 11:45:39 -07:00
kevinz000
f36b89a6e3 Update misc.dm 2020-02-14 11:53:50 -07:00
kevinz000
efc94565b6 Update misc.dm 2020-02-14 00:40:50 -07:00
kevinz000
e9baf17233 Update misc.dm 2020-02-14 00:40:19 -07:00