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
|
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 |
|
silicons
|
22ad8f2c8c
|
Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash
[Ready] The Daily Whiplash (Newspaper Baton)
|
2021-06-29 08:50:48 -07:00 |
|
silicons
|
08f251a88c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-27 10:44:51 -07:00 |
|
WanderingFox95
|
eb74ad2137
|
And a recipe.
You attach a newspaper to a telebaton with tape.
|
2021-06-25 11:39:22 +02:00 |
|
DeltaFire
|
c7a098da06
|
suffering (aka, a bunch of fixes)
|
2021-06-21 19:05:31 +02:00 |
|
Putnam3145
|
c253a2de86
|
alright how about these
|
2021-06-21 09:52:54 -07:00 |
|
Putnam3145
|
0bf383a90b
|
does this fix it
|
2021-06-21 09:18:06 -07:00 |
|
silicons
|
4768b23398
|
Merge pull request #14860 from Arturlang/nanite_updates
Updates our nanite stuff to TG's, mostly
|
2021-06-18 20:01:05 -07:00 |
|
silicons
|
c1928c9446
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-16 19:04:16 -07:00 |
|
WanderingFox95
|
02bbe70810
|
This is so the crafting menu doesn't break. My bad.
|
2021-06-16 23:23:38 +02:00 |
|
Lin
|
1e66357706
|
Merge pull request #14851 from Vynzill/spritinghell
Extended Armwraps
|
2021-06-16 11:30:01 -07:00 |
|
Timothy Teakettle
|
e12380cc40
|
Update embedded.dm (#14854)
|
2021-06-16 19:27:19 +02:00 |
|
WanderingFox95
|
5f4a07ce12
|
Also I'm a dork and forgot the recipe.
|
2021-06-16 13:41:15 +02:00 |
|
Artur
|
724b34f55d
|
https://github.com/tgstation/tgstation/pull/54710
|
2021-06-16 00:44:32 +03:00 |
|
Vynzill
|
df72710cae
|
herewego
|
2021-06-14 17:19:05 -05:00 |
|
silicons
|
8feb473e65
|
fixes
|
2021-06-12 04:49:23 -07:00 |
|
silicons
|
55e8d67521
|
refactor a bit
|
2021-06-12 04:41:58 -07:00 |
|
silicons
|
85b1125c83
|
fix
|
2021-06-12 04:36:02 -07:00 |
|
silicons
|
40f2c06f2e
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-07 16:47:11 -07:00 |
|
silicons
|
4afb5209a1
|
Merge pull request #14637 from TheObserver-sys/DerringerPass1
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
|
2021-05-07 18:42:24 -06:00 |
|
silicons
|
cb1e2f3730
|
thing
|
2021-05-06 02:09:06 -07:00 |
|
silicons
|
7ccb5bc711
|
fixes
|
2021-04-26 14:21:59 -07:00 |
|
silicons
|
275b532a8c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-04-26 14:17:43 -07:00 |
|
silicons
|
d07f1f3d30
|
Update radioactive.dm (#14615)
|
2021-04-24 21:51:53 +02:00 |
|
The0bserver
|
59d69125f6
|
Consistency: You can hide it in your boots!
|
2021-04-21 12:18:01 -04:00 |
|
silicons
|
e8e625cb5c
|
Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
|
2021-04-18 18:49:27 -06:00 |
|
Putnam
|
4811216f07
|
Activity tracking; traitor class tweaks
|
2021-04-13 06:42:32 -07:00 |
|
silicons
|
ef2482c6b0
|
renders storage objects independently per user (#14545)
* sigh
* sigh
* override
* hah..
* kinda working
* done
|
2021-04-13 15:16:21 +02:00 |
|
LetterN
|
f976a89157
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-31 08:19:31 +08:00 |
|
silicons
|
bf382f490c
|
Merge pull request #14518 from necromanceranne/shield_explodies_fix
Shields: Changes, additional flags, bug fixes, sprites
|
2021-03-27 01:31:55 -06:00 |
|
necromanceranne
|
2368968c66
|
Ports #42721 which happened to resolve this already
|
2021-03-26 08:45:14 +11:00 |
|
LetterN
|
e3fb2d5491
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-24 21:55:47 +08:00 |
|
silicons
|
1fd06a89b7
|
Oh Boy
|
2021-03-20 16:27:52 -07:00 |
|
silicons
|
5b2a42f254
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-20 14:13:23 -07:00 |
|
silicons
|
957c1fcc5d
|
okay
|
2021-03-20 14:09:23 -07:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
kappa-sama
|
1f7b15d8f8
|
clonwops
|
2021-03-19 15:35:17 -03:00 |
|
silicons
|
5d51025ad6
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-15 14:39:16 -07:00 |
|
kiwedespars
|
69d927e756
|
Merge branch 'master' into void-but-for-real
|
2021-03-12 23:10:19 -08:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
kiwedespars
|
3b92e33112
|
Merge branch 'master' into void-but-for-real
|
2021-03-09 12:29:50 -08:00 |
|
kiwedespars
|
3ce6459aef
|
void heretic and many other prs
|
2021-03-09 02:58:34 -08:00 |
|
Sneakyrat6
|
d5b0251cb5
|
Merge branch 'master' into matContainer
|
2021-03-09 05:42:47 -05:00 |
|
Sneakyrat6
|
0db08088c4
|
Fixes material insertion animations not working when there is no silo
|
2021-03-07 22:43:55 -05:00 |
|
Sneakyrat6
|
395bdaf5f9
|
removes code i commented out
|
2021-03-07 04:13:18 -05:00 |
|
Sneakyrat6
|
703567e591
|
other fixes
|
2021-03-07 04:09:36 -05:00 |
|
Sneakyrat6
|
f875218284
|
Fixes material component
|
2021-03-06 03:48:52 -05:00 |
|