 Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
BongaTheProto
|
21d13aae28
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-25 22:48:49 -05:00 |
|
|
BongaTheProto
|
e87e828638
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-25 22:47:02 -05:00 |
|
|
SandPoot
|
07f5e85c2c
|
override
|
2023-07-25 13:37:43 -03:00 |
|
|
SandPoot
|
7e51ef0b98
|
fix merge
|
2023-07-23 19:06:55 -03:00 |
|
|
SandPoot
|
ef186347ca
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-23 18:56:20 -03:00 |
|
|
SandPoot
|
19ee7f8bd2
|
some hints
|
2023-07-19 20:51:25 -03:00 |
|
|
BongaTheProto
|
f4e7294296
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-13 19:57:48 -05:00 |
|
|
SandPoot
|
737c2f200d
|
content
|
2023-07-12 13:04:01 -03:00 |
|
|
BongaTheProto
|
972df3f711
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-16 16:30:59 -05:00 |
|
|
SandPoot
|
072087ec14
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-15 20:22:44 -03:00 |
|
|
SandPoot
|
c1e8039c11
|
source
|
2023-02-09 03:00:56 -03:00 |
|
|
SandPoot
|
78c28a40c7
|
sneaky hint about reskinning
|
2023-02-09 02:54:31 -03:00 |
|
|
SandPoot
|
d29ce2328c
|
some extra touches
|
2023-02-09 02:25:34 -03:00 |
|
|
SandPoot
|
4491abc2d7
|
updates to most recent version and puts intent hints!
|
2023-02-09 02:20:02 -03:00 |
|
|
SandPoot
|
1b1154260c
|
correct everything and some intention based checks
|
2023-02-08 02:17:57 -03:00 |
|
|
SandPoot
|
ed06e686e1
|
pushies.
|
2023-01-31 16:40:17 -03:00 |
|
|
BongaTheProto
|
86a005b590
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-11 12:51:40 -05:00 |
|
|
SandPoot
|
03304ba2c8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-10 22:50:16 -03:00 |
|
|
SandPoot
|
3b8d102fac
|
puts pda in the system to remove shitcode
|
2023-01-10 20:02:12 -03:00 |
|
|
SandPoot
|
cf51a4dce9
|
dusting off
|
2023-01-10 18:32:49 -03:00 |
|
|
SandPoot
|
6bbd44afe7
|
element time
|
2023-01-10 18:08:17 -03:00 |
|
|
BongaTheProto
|
ab9d691f1a
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-09 16:59:38 -05:00 |
|
|
SandPoot
|
82eff346c7
|
Merge Upstream
|
2023-01-07 22:52:22 -03:00 |
|
|
Hatterhat
|
34eaf93a01
|
sorters! one-way setting! brazen code borrowing!
|
2022-12-29 20:18:34 -06:00 |
|
|
BongaTheProto
|
03f4c65fc4
|
Merge remote-tracking branch 'upstream/master'
|
2022-06-11 23:25:29 -05:00 |
|
|
SandPoot
|
07a4c5c12b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-06-11 04:54:12 -03:00 |
|
|
|
884fcc46c8
|
Update code/datums/elements/strippable.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2022-06-05 23:49:16 -03:00 |
|
|
SandPoot
|
670ffd6edf
|
apply silence and fasts
|
2022-06-05 22:54:16 -03:00 |
|
|
BongaTheProto
|
92365973ea
|
Merge branch 'master' into prefs-update
|
2022-05-21 03:18:18 -05:00 |
|
|
BongaTheProto
|
85ab43e734
|
Merge remote-tracking branch 'upstream/master'
|
2022-05-21 03:00:06 -05:00 |
|
|
SandPoot
|
89fa5c0bfe
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-05-21 00:13:59 -03:00 |
|
|
SandPoot
|
73da7b6e03
|
flavor_Text != flavor_text
|
2022-05-20 00:00:42 -03:00 |
|
|
SandPoot
|
da1f58f297
|
Update files
|
2022-05-19 13:23:17 -03:00 |
|
|
BongaTheProto
|
603a3fbe9b
|
Merge branch 'master' into prefs-update
|
2022-05-16 15:00:20 -05:00 |
|
|
Yawet330andGitHub
|
3175a2bc16
|
Should allow ghosts to bypass most flavortext hiding.
|
2022-05-14 01:18:19 +01:00 |
|
|
BongaTheProto
|
275eee6c7c
|
headshots
I'll modularize this when I wake up
|
2022-05-09 02:40:18 -05:00 |
|
|
BongaTheProto
|
90a52494cd
|
Merge remote-tracking branch 'upstream/master'
|
2022-04-30 16:35:30 -05:00 |
|
|
SandPoot
|
41949a8be1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-29 13:24:42 -03:00 |
|
|
Timothy Teakettle
|
2d433e71de
|
grammar
|
2022-04-26 15:07:58 +01:00 |
|
|
Iosyf
|
4e2945bf5a
|
ignore this
Redundancy fix
|
2022-04-26 00:26:45 +03:00 |
|
|
Timothy Teakettle
|
537e72a657
|
Update trash.dm
|
2022-04-24 23:38:50 +01:00 |
|
|
Iosyf
|
847472486d
|
Runtime Ironing out (mostly null checks)
checking for nulls in:
flavor_text.dm
new_player.dm
coiling.dm
tgyu,dm
lewd_shoes.dm
storage.dm
milking_machine.dm - for some reason tried calling /obj/effect/decal/cleanable/semen/getorganslot() (line 81)
|
2022-04-23 19:47:52 +03:00 |
|
|
BongaTheProto
|
479b497b00
|
ok
|
2022-04-19 01:30:44 -05:00 |
|
|
nullfag
|
a4c5fa6912
|
"modularity" fix
|
2022-04-15 00:37:05 +02:00 |
|
|
nullfag
|
ea17a468a8
|
naked flavor text
|
2022-04-15 00:37:05 +02:00 |
|
|
BongaTheProto
|
a4fac709c3
|
Merge remote-tracking branch 'upstream/master'
|
2022-04-09 11:43:45 -05:00 |
|
|
SandPoot
|
ada0ea7f32
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-09 02:40:23 -03:00 |
|
|
siliconsandGitHub
|
dee1db4a3a
|
Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
|
2022-04-08 18:26:47 -07:00 |
|
|
BongaTheProtoandGitHub
|
f5af499eee
|
Merge branch 'Sandstorm-Station:master' into master
|
2022-04-06 16:01:25 -05:00 |
|