Commit Graph

26 Commits

Author SHA1 Message Date
SandPoot
7523279254 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-07 22:07:59 -03:00
silicons
af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460)
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
2022-02-07 15:17:24 -08:00
SandPoot
ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot
f0409a598a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-20 19:23:02 -03:00
Artur
5aa710ffd7 spess 2021-01-20 16:05:20 +02:00
Artur
ef950400a4 Fixes the space tackling meme 2021-01-20 15:50:41 +02:00
SandPoot
bf8a6c0d62 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-28 17:24:21 -03:00
Timothy Teakettle
b1e5888ce0 Update tackle.dm 2020-12-28 17:40:04 +00:00
Timothy Teakettle
05e5c80dce runtime 2020-12-26 00:17:29 +00:00
Timothy Teakettle
8c8be2b92e tackle and puddle 2020-12-25 21:45:07 +00:00
SandPoot
13834c4bef Morrowinventory Port (#75) 2020-09-24 20:14:53 -03:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
kevinz000
6bfdb762d4 Update tackle.dm 2020-06-13 14:13:01 -07:00
kevinz000
49feb22b4d Update tackle.dm 2020-06-13 13:15:53 -07:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Arturlang
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
Artur
edb7b1d61c Fixes catstuffs 2020-04-18 13:52:27 +03:00
Artur
85c5548d1a Ports https://github.com/tgstation/tgstation/pull/50521/ 2020-04-18 13:49:06 +03:00
Artur
eafc69aa65 Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
2020-04-17 16:22:15 +03:00
Artur
375c62175f Finishing touches, fixes icons 2020-04-15 12:04:25 +03:00
Artur
325c011142 Comsigs are hard... 2020-04-14 09:07:37 +03:00
Artur
38d1634e13 Weh 2020-04-10 21:07:15 +03:00
Artur
f481be1496 Makin stuff nice and dandy 2020-04-10 20:53:28 +03:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00