SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -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
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
silicons
03e8c32acd
Merge pull request #15402 from Linzolle/pinremoval
...
finally change pin removal from crafting to tools
2021-12-19 18:54:50 -08:00
DeltaFire
e576962ac3
e
2021-12-03 18:29:13 +01:00
Lin
5dc9704e5d
Merge pull request #15380 from DeltaFire15/oops-all-wounds
...
Block & Pellet wound pass
2021-11-30 20:24:42 +00:00
Linzolle
9807a2f9e0
pin removal and gun examine things
2021-11-29 17:22:13 -07:00
Lin
e3a5391250
Merge pull request #14868 from Arturlang/admin_mapsave
...
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00:00
LetterN
41e5034005
i forgot about this component. Lavaland should have sounds now
2021-11-22 14:18:46 +08:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
Lin
43e4c71d04
Merge pull request #15384 from SandPoot/acid-bgone
...
Acid overlay no longer lingers after done
2021-11-19 23:02:49 +00:00
Artur
99dedb54ed
Merge remote-tracking branch 'upstream/master' into admin_mapsave
2021-11-20 00:16:56 +02:00
SandPoot
9d3857c94e
Upload files
2021-11-18 14:57:19 -03:00
DeltaFire
ef9c90d512
embeds, unarmed and wounds
2021-11-16 20:26:38 +01:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
LetterN
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
silicons
a32eabb7ae
fix
2021-10-29 22:44:01 -07:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
LetterN
49940c373e
tgui backend
2021-10-28 12:51:31 +08:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
Artur
bfcdf83e55
buildmode mapgen tool save
2021-10-26 16:31:36 +03:00
WanderingFox95
4b13d1772c
[Ready] Bone Anvil and processable Bone ingots ( #15290 )
...
* Adding all the extra stuff
* whoops, slipped my last fix in here.
* bone balance
* 6 Goliaths + 3 Watchers + 1 Legion
* bumps the damage modifier down to 1.05
* More Bones.
* Undoes the undoing of the other fix PR
Co-authored-by: Emily <null>
2021-10-25 18:11:54 +02:00
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
silicons
f024318810
Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul
...
Tribal Crafting Overhauled & Expanded
2021-10-03 11:20:55 -07:00
SandPoot
b23b88524d
Upload files
2021-09-28 22:03:17 -03:00
WanderingFox95
fe8a652689
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-19 21:32:03 +02:00
zerothebigboy
5a8a069cd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern
...
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/mob/clothing/suit_digi.dmi
# icons/obj/clothing/suits.dmi
2021-09-09 04:49:30 -04:00
zerothebigboy
9f4f099880
gommit
2021-09-02 03:05:23 -04:00
Cognition
d18e5e7c25
fixes waddling ruining character size
2021-08-27 21:15:37 -07:00
silicons
d427c43b7b
Merge pull request #15032 from keronshb/itemhighlight
...
Ports Inventory Outlines
2021-08-26 21:41:25 -07:00
Lin
3f8895e41d
Merge pull request #15031 from zeroisthebiggay/patch-16
...
undoes more Trillby™ Spelling™
2021-08-22 13:19:59 -05:00
keronshb
7070a848b6
Item Highlight Port
2021-08-22 00:21:06 -04:00
zeroisthebiggay
7b7541b77e
Update glassware.dm
2021-08-21 05:51:02 -04:00
zeroisthebiggay
efc5598263
Update code/datums/components/crafting/glassware/lens_crafting.dm
...
Co-authored-by: MarinaGryphon <jadebishop.2562@gmail.com >
2021-08-20 21:55:54 -04:00
zeroisthebiggay
42964392e3
Update lens_crafting.dm
2021-08-19 23:39:05 -04:00
Artur
4b2bffdff0
Actually makes it work by /obj/screen --> /atom/movable/screen
2021-07-29 14:06:18 +03:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
WanderingFox95
960ce45d29
Adds all the recipes and uncaps them
2021-07-20 18:59:15 +02:00
silicons
3070f178e0
Merge remote-tracking branch 'citadel/master' into combat_patches_1
2021-07-18 15:12:52 -07:00
Artur
5abace9e8c
wrong letter and unneceseary variable
2021-07-16 15:22:49 +03:00
Artur
b71a6497e8
Crafting menu fixes and such
...
Fixes crafting buttons making more of themselves on relogs, and cleans some wierd as fuck shit.
2021-07-16 03:23:02 +03:00
Lin
d50eb91632
Merge pull request #14921 from Putnam3145/componentize-acid
...
Componentizes acid
2021-07-13 11:52:43 -07:00
Lin
114df4e717
Merge pull request #14920 from Putnam3145/fix-activity-runtime-again
...
Fixes a runtime in activity tracking
2021-07-12 00:03:53 -07:00
silicons
d0b3857cb6
Merge pull request #14842 from WanderingFox95/WanderingFox95-TheWheelchairPRs
...
[Ready] Wheelchair Sprite Rollback + Motorized Hoverchairs
2021-07-09 16:50:00 -07:00
Putnam3145
899e74fc83
Componentized acid
2021-07-03 22:10:44 -07:00
Putnam3145
e437f6514a
Fixes a runtime in activity tracking
2021-07-03 21:09:27 -07:00
Putnam3145
f3b590f5f0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps
2021-06-30 02:19:02 -07:00
