 siliconsandGitHub
|
5204f5a6d9
|
Merge pull request #13991 from Putnam3145/auxtools-atmos
Replaces extools with auxtools; atmos overhaul
|
2021-06-27 11:01:32 -07:00 |
|
|
silicons
|
08f251a88c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-27 10:44:51 -07:00 |
|
|
WanderingFox95andGitHub
|
9bd1433bbe
|
Adds a child item to the telebaton
identical stats for the future but different looks.
|
2021-06-25 11:38:21 +02:00 |
|
|
Putnam3145
|
37fe5f297c
|
fix double . in fusion scan
|
2021-06-22 22:38:20 -07:00 |
|
|
WanderingFox95andGitHub
|
e709d5cf0c
|
More code. Shouldn't break anything.
We'll see if it does.
|
2021-06-22 13:35:37 +02:00 |
|
|
Putnam3145
|
fbbae70527
|
i need to go to bed and this is a LOT
|
2021-06-21 10:14:50 -07:00 |
|
|
Putnam3145
|
0bf383a90b
|
does this fix it
|
2021-06-21 09:18:06 -07:00 |
|
|
|
98ff06fa1a
|
the roasted roasted roasted roasted roasted roasted roasted roasted......... (#14850)
* Update misc.dm
* Update code/game/objects/items/melee/misc.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
* Update misc.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
|
2021-06-21 17:54:56 +02:00 |
|
|
Putnam3145
|
f77495f45d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-06-21 02:19:51 -07:00 |
|
|
siliconsandGitHub
|
29604b939c
|
Update glowshroom.dm
|
2021-06-20 13:18:54 -07:00 |
|
|
siliconsandGitHub
|
d704fec039
|
Update stunbaton.dm
|
2021-06-20 11:08:46 -07:00 |
|
|
siliconsandGitHub
|
54d114ce02
|
Update stunbaton.dm
|
2021-06-20 11:06:40 -07:00 |
|
|
zerothebigboy
|
fb32aa1248
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# tgstation.dme
|
2021-06-20 03:29:50 -04:00 |
|
|
siliconsandGitHub
|
8f3c1fe03a
|
Update glowshroom.dm
|
2021-06-19 07:02:51 -07:00 |
|
|
siliconsandGitHub
|
c0e3af55bc
|
Update glowshroom.dm
|
2021-06-19 06:59:26 -07:00 |
|
|
Putnam3145
|
dbdc3001ba
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-06-16 23:33:14 -07:00 |
|
|
silicons
|
01e0fa16fe
|
it works.
|
2021-06-14 13:52:48 -07:00 |
|
|
silicons
|
8595e05ad9
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-13 15:37:35 -07:00 |
|
|
zerothebigboy
|
a64d94a7cc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites
|
2021-06-13 18:25:35 -04:00 |
|
|
zerothebigboy
|
bae89fcaba
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites
|
2021-06-13 18:19:01 -04:00 |
|
|
zerothebigboy
|
319e03476b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites
|
2021-06-13 18:16:08 -04:00 |
|
|
siliconsandGitHub
|
431acd9d5c
|
Merge pull request #14820 from qweq12yt/more-cargo-stuff
[FIX] Some cargo related fixes
|
2021-06-13 15:15:20 -07:00 |
|
|
zerothebigboy
|
e757f9ea2c
|
thetwentythirdofmany
|
2021-06-12 17:41:09 -04:00 |
|
|
zerothebigboy
|
e0a311435b
|
thetwentysecondofmany
|
2021-06-11 20:53:35 -04:00 |
|
|
zerothebigboy
|
3fae79f876
|
thetwentyfirstofmany
|
2021-06-11 20:28:25 -04:00 |
|
|
zerothebigboy
|
b7eecc315f
|
theeighteenthofmany
|
2021-06-11 19:49:43 -04:00 |
|
|
zerothebigboy
|
53e95b7356
|
theseventeenthofmany
|
2021-06-11 19:48:04 -04:00 |
|
|
Putnam
|
78cf3463ba
|
Updates to master
Closes #14823
|
2021-06-11 16:29:04 -07:00 |
|
|
Putnam
|
833d34ba8e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-06-11 16:28:12 -07:00 |
|
|
zerothebigboy
|
8a5a5ef6cc
|
thethirteenthofmany
|
2021-06-11 19:22:05 -04:00 |
|
|
qweq12yt
|
0ca61af62a
|
fixed combo lockers
|
2021-06-10 16:50:44 -03:00 |
|
|
Putnam
|
3b25f3e199
|
Started expanding auxgm a bit
|
2021-06-10 04:40:23 -07:00 |
|
|
zeroisthebiggayandGitHub
|
c6a70b9a4e
|
Update weaponry.dm
|
2021-06-09 18:37:11 -04:00 |
|
|
zerothebigboy
|
fba4b1966c
|
painful
|
2021-06-09 18:30:32 -04:00 |
|
|
zerothebigboy
|
190edf57e8
|
painful
|
2021-06-09 18:28:21 -04:00 |
|
|
siliconsandGitHub
|
a77aa8bd41
|
Merge pull request #14766 from Linzolle/cultfix
Fix cult area shenanigans, cult can do stuff in maint again.
|
2021-06-09 11:22:26 -07:00 |
|
|
siliconsandGitHub
|
0ee2892bee
|
Merge pull request #14807 from Putnam3145/make-sleeper-pref-good
makes medihound sleeper toggle do something
|
2021-06-09 11:17:39 -07:00 |
|
|
siliconsandGitHub
|
a7781f77fd
|
Merge pull request #14802 from bunny232/atmosfoam
Atmos resin buff? fix?
|
2021-06-09 11:15:56 -07:00 |
|
|
siliconsandGitHub
|
259aed7903
|
Merge pull request #14783 from DeltaFire15/spec-species-color
Colors species names depending on traits
|
2021-06-09 11:14:48 -07:00 |
|
|
siliconsandGitHub
|
fe8323f503
|
Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
Adds more deconstruction steps to stronger windows.
|
2021-06-09 11:13:13 -07:00 |
|
|
siliconsandGitHub
|
716c2a04e4
|
Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
|
2021-06-09 11:10:17 -07:00 |
|
|
Putnam
|
86177c51c4
|
auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
|
2021-06-08 09:54:28 -07:00 |
|
|
Putnam
|
fcd1ec83cc
|
removed redundant check
|
2021-06-08 00:25:31 -07:00 |
|
|
Putnam
|
f6e08a8d2a
|
include a message too
|
2021-06-08 00:24:54 -07:00 |
|
|
Putnam
|
a236357ebe
|
makes medihound sleeper toggle do something
|
2021-06-08 00:21:19 -07:00 |
|
|
silicons
|
1a800cc470
|
modifications
|
2021-06-07 19:40:16 -07:00 |
|
|
silicons
|
40f2c06f2e
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-07 16:47:11 -07:00 |
|
|
Putnam
|
d03bf641dd
|
extreme optimization project to maybe fix game
|
2021-06-06 21:58:24 -07:00 |
|
|
bunny232
|
7826ced174
|
Update effects_foam.dm
|
2021-06-06 12:54:07 -04:00 |
|
|
DeltaFire
|
dd33371a3b
|
colors
|
2021-06-01 22:48:57 +02:00 |
|