 BongaTheProto
|
03dacc17e6
|
preparing for better size stuff
aaaaaaaaaaaaaaa
|
2021-12-09 12:39:19 -05:00 |
|
|
SandPootandGitHub
|
6790009f7a
|
Size Stuff (#206)
* Upload files
* Update holder_micro.dm
* Upload files
|
2021-12-09 14:13:27 -03:00 |
|
|
BongaTheProto
|
39a9180f6f
|
Merge branch 'master' into pr/68
|
2021-12-08 21:29:57 -05:00 |
|
|
Putnam3145
|
629ce5bea6
|
Station traits
|
2021-12-08 16:17:35 -08:00 |
|
|
BongaTheProto
|
c7bd65b1a6
|
Merge remote-tracking branch 'upstream/master'
|
2021-12-08 15:01:52 -05:00 |
|
|
E
|
58b195acc0
|
also because someone asked
|
2021-12-08 20:05:43 +01:00 |
|
|
SandPoot
|
ca74834260
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-12-08 15:17:23 -03:00 |
|
|
DeltaFire
|
50be57f107
|
grrrr
|
2021-12-08 18:33:06 +01:00 |
|
|
Cognition
|
3b52782ae5
|
Merge branch 'master' into wingport
|
2021-12-08 00:02:13 -07:00 |
|
|
DeltaFire
|
04797a961b
|
linters b gone
|
2021-12-08 05:07:22 +01:00 |
|
|
Cognition
|
318240bdc6
|
TG wing port - Now YOU TOO, can be an "angel"
|
2021-12-07 18:59:07 -07:00 |
|
|
E
|
dc2b87d382
|
me using the wrong branch be like
|
2021-12-07 19:05:10 +01:00 |
|
|
Crowbar764andGitHub
|
251c015dc8
|
Merge branch 'master' into slaver-antag
|
2021-12-05 19:59:35 +00:00 |
|
|
James
|
9258b93f64
|
Modularises (most of) the code into EROS module folder
|
2021-12-05 19:39:24 +00:00 |
|
|
James
|
17dcf7331f
|
Added more buyable gear.
|
2021-12-05 10:45:51 +00:00 |
|
|
James
|
738e009078
|
Adds WIP shuttle / hideout. Adds teleport implant. More slave stuff.
|
2021-12-04 06:02:40 +00:00 |
|
|
James
|
f3726aba32
|
Added slave collars, slave console and modified comms console
|
2021-12-02 17:01:23 +00:00 |
|
|
E
|
7e2e6797cf
|
r
|
2021-12-02 01:04:10 +01:00 |
|
|
E
|
52d4143c83
|
yeet
|
2021-12-02 00:59:39 +01:00 |
|
|
BongaTheProtoandGitHub
|
41bcf2ec17
|
Merge branch 'Sandstorm-Station:master' into master
|
2021-11-30 21:38:45 -05:00 |
|
|
SandPoot
|
a49a1c625d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-11-30 22:25:44 -03:00 |
|
|
LinandGitHub
|
e506bc50dc
|
Merge pull request #15335 from DeltaFire15/synth-chem-time
Synth / IPC kinda-buffs - Chemwarfare Edition
|
2021-12-01 00:39:02 +00:00 |
|
|
BongaTheProtoandGitHub
|
2e47d1e3e3
|
Merge branch 'Sandstorm-Station:master' into master
|
2021-11-30 17:12:27 -05:00 |
|
|
SandPoot
|
ece8b2fbf6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-11-30 17:43:13 -03:00 |
|
|
LinandGitHub
|
5dc9704e5d
|
Merge pull request #15380 from DeltaFire15/oops-all-wounds
Block & Pellet wound pass
|
2021-11-30 20:24:42 +00:00 |
|
|
BongaTheProtoandGitHub
|
07a1011cc8
|
Merge branch 'Sandstorm-Station:master' into master
|
2021-11-24 23:06:03 -05:00 |
|
|
SandPoot
|
ed053988d8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-11-24 22:11:23 -03:00 |
|
|
LinandGitHub
|
d5c17f0d84
|
Merge pull request #15376 from SandPoot/double
Double beds
|
2021-11-24 17:38:10 +00:00 |
|
|
Chayse Ramsay
|
31a0de04d5
|
Fixes chem nades too, since fixing grenades as a whole broke them changing timer
|
2021-11-21 06:24:55 +00:00 |
|
|
Chayse Ramsay
|
9545b180c6
|
Update grenade.dm
|
2021-11-21 06:08:20 +00:00 |
|
|
BongaTheProto
|
f60fafb3d8
|
Merge remote-tracking branch 'upstream/better-size-code' into better-size-code-splurt
|
2021-11-21 00:03:18 -05:00 |
|
|
LetterN
|
8dcfea5817
|
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
|
2021-11-21 10:34:14 +08:00 |
|
|
BongaTheProtoandGitHub
|
68015817b3
|
Merge branch 'Sandstorm-Station:master' into master
|
2021-11-20 02:55:56 -05:00 |
|
|
SandPoot
|
2f8bfa8667
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-11-20 01:38:26 -03:00 |
|
|
LinandGitHub
|
1de965a90e
|
Merge pull request #15385 from buffyuwu/crayons.dm
dont color my entire canvas neon green when im painting please
|
2021-11-20 03:36:38 +00:00 |
|
|
BongaTheProtoandGitHub
|
93ec9de657
|
Merge branch 'Sandstorm-Station:master' into master
|
2021-11-19 15:53:12 -05:00 |
|
|
|
9370f6423c
|
Craftable brass plant and suits. (#197)
* craftable plant and suits
* Update code/game/objects/items/stacks/sheets/sheet_types.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
* Update sheet_types.dm
* Update modular_sand/code/game/objects/structures/fauna.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
* Update modular_sand/code/game/objects/structures/fauna.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
* Update modular_sand/code/game/objects/structures/fauna.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
|
2021-11-19 15:21:37 -03:00 |
|
|
Putnam3145andGitHub
|
cf4cc39a3b
|
Merge pull request #15222 from raspy-on-osu/apcfix
save hours of pain for new engineers with this one simple trick!! click here to find out
|
2021-11-18 20:18:11 -08:00 |
|
|
buffyuwu
|
612087f7e5
|
Update crayons.dm
|
2021-11-18 20:44:01 -05:00 |
|
|
BongaTheProto
|
703413027c
|
Merge remote-tracking branch 'upstream/master'
|
2021-11-17 14:33:29 -05:00 |
|
|
SandPoot
|
34900425aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-11-17 13:48:32 -03:00 |
|
|
DeltaFire
|
ef9c90d512
|
embeds, unarmed and wounds
|
2021-11-16 20:26:38 +01:00 |
|
|
Putnam3145
|
1da28b8ec6
|
Chem gas tweaks, + toxins rebalance
|
2021-11-15 16:29:30 -08:00 |
|
|
SandPoot
|
5b85c260a7
|
Upload files
|
2021-11-15 01:34:30 -03:00 |
|
|
DeltaFire
|
6224da71a3
|
contents_explosion
at least this one had less overrides.
|
2021-11-14 21:41:42 +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 |
|
|
DeltaFire
|
b4e6b0785d
|
chemscan
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
|
2021-11-12 19:38:10 +01:00 |
|
|
keronshb
|
632b1b36cc
|
Fixes crayons
|
2021-11-11 20:10:57 -05:00 |
|
|
LetterN
|
8b16653744
|
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
|
2021-11-12 08:50:23 +08:00 |
|
|
keronshb
|
659d7aa715
|
Merge remote-tracking branch 'upstream/master' into familyport
|
2021-11-11 19:35:40 -05:00 |
|