BongaTheProto
|
dbd4505372
|
Merge remote-tracking branch 'upstream/master'
|
2024-04-30 19:02:41 -05:00 |
|
SandPoot
|
91a9223df6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-25 17:08:42 -03:00 |
|
SandPoot
|
fc53ab850c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-14 20:15:08 -03:00 |
|
Elizabeth Lavenza
|
0772450dbc
|
Port set_stat and COMSIG_MOB_STATCHANGE from TG
|
2024-04-13 20:00:29 -04:00 |
|
Elizabeth Lavenza
|
174aca4b01
|
Port set_stat and COMSIG_MOB_STATCHANGE from TG
|
2024-04-13 18:06:52 -04:00 |
|
BongaTheProto
|
1e1fc329f8
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-13 14:12:39 -05:00 |
|
SandPoot
|
2e2528ee56
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-13 00:36:29 -03:00 |
|
SandPoot
|
ccbf3dc0dd
|
closet dor
|
2024-04-12 22:57:00 -03:00 |
|
BongaTheProto
|
d20caf7191
|
Merge branch '515-update' into upstream-merge
|
2024-03-24 17:39:24 -05:00 |
|
BongaTheProto
|
b2e14a5393
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-03-24 17:02:38 -05:00 |
|
BongaTheProto
|
8bbb0fda41
|
Merge branch 'master' into upstream-merge
|
2024-03-24 16:41:07 -05:00 |
|
SandPoot
|
b76127c2d7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-15 19:21:39 -03:00 |
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03:00 |
|
BongaTheProto
|
1883c47d5c
|
basic ref regex
makes the proc calls compatible with 515
|
2024-03-11 19:46:05 -05:00 |
|
SandPoot
|
a65f323734
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
|
2024-03-08 19:10:22 -03:00 |
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
ariaworld
|
aefd604725
|
Final tweaks for blow kiss update
|
2024-02-23 15:59:13 +01:00 |
|
 ariaworldandGitHub
|
769e2543aa
|
Merge branch 'SPLURT-Station:master' into infinidorms-hotel-update
|
2024-02-10 21:57:42 +01:00 |
|
ariaworld
|
93f0fb7e6c
|
Fix a few hard-dels
|
2024-01-21 16:14:07 +01:00 |
|
 SandPootandGitHub
|
419f3b5ac8
|
Merge pull request #367 from DetectiveEnotsky/patch-1
Allows you to pick your character for certain ghost roles
|
2024-01-19 22:01:03 -03:00 |
|
SandPoot
|
06af18b7db
|
push
|
2024-01-19 20:18:26 -03:00 |
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
SandPoot
|
2cefedd316
|
push
|
2024-01-16 16:54:53 -03:00 |
|
ariaworld
|
6c0cbb6115
|
Stops using tryStoredRoom because turfs can't be moved off the map
|
2024-01-07 23:20:31 +01:00 |
|
ariaworld
|
09dcd32751
|
Revert changes done to trystoredroom and storeroom functions
|
2024-01-07 20:19:21 +01:00 |
|
ariaworld
|
4863b89009
|
Infinidorms update!
|
2024-01-07 04:57:04 +01:00 |
|
SandPoot
|
6d7321b0c4
|
okay so this is necessary
|
2024-01-05 22:09:21 -03:00 |
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
SandPoot
|
7eaef36e11
|
d k daunkey kaung
|
2024-01-03 22:42:03 -03:00 |
|
BongaTheProto
|
a9715638ad
|
Merge remote-tracking branch 'upstream/master'
|
2024-01-02 01:00:59 -05:00 |
|
SandPoot
|
4e9ff44ee7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-29 15:49:14 -03:00 |
|
 deathride58andGitHub
|
ce1d757159
|
Merge pull request #16016 from SandPoot/throwing-update
[TESTMERGE] Updates firemanning, throwing stuff
|
2023-12-28 22:44:59 -05:00 |
|
BongaTheProto
|
13cd269788
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-25 14:28:51 -05:00 |
|
SandPoot
|
be37603291
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-23 13:28:41 -03:00 |
|
SandPoot
|
b9a422ee2d
|
throw at mobs laying down
|
2023-12-18 14:07:25 -03:00 |
|
SandPoot
|
27bdd4b732
|
aiModule > ai_module
|
2023-12-17 23:20:43 -03:00 |
|
SandPoot
|
7b62dbe7bb
|
ai + mech
|
2023-12-17 23:15:59 -03:00 |
|
 BongaTheProtoandGitHub
|
bb458c8cc1
|
Merge pull request #1014 from Yawet330/secfix2
yippee - I spent 2 hours looking for security exploits
|
2023-12-13 22:44:13 -05:00 |
|
 BongaTheProtoandGitHub
|
5fa6d54bb1
|
Update code/game/objects/structures/crates_lockers/closets/genpop.dm
|
2023-12-04 14:56:42 -05:00 |
|
 BongaTheProtoandGitHub
|
fce4ddfbea
|
Update code/game/objects/structures/crates_lockers/closets/genpop.dm
|
2023-12-04 14:56:36 -05:00 |
|
SandPoot
|
a558377206
|
more stuff i can't guarantee works by itself yet
|
2023-11-29 23:37:15 -03:00 |
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
Yawet330
|
2325928610
|
yippee
|
2023-11-29 16:49:36 +00:00 |
|
 ariaworldandGitHub
|
d10a773e3f
|
Merge branch 'SPLURT-Station:master' into spooktober-update
|
2023-11-18 15:01:21 +01:00 |
|
ariaworld
|
e98019e91e
|
Push, push, push.
|
2023-11-17 21:34:27 +01:00 |
|
ariaworld
|
23f141965e
|
First draft.
|
2023-10-31 14:03:34 +01:00 |
|
MysteryMan21333
|
06153ae98f
|
Xenobiology V1.0
|
2023-10-14 07:15:46 -05:00 |
|
SandPoot
|
b36da8f5d7
|
Revert "Revert "[DNM] Updates firemanning, throwing stuff""
This reverts commit def4b38a46.
|
2023-10-12 14:34:02 -03:00 |
|
 BlueWildroseandGitHub
|
def4b38a46
|
Revert "[DNM] Updates firemanning, throwing stuff"
|
2023-10-11 13:52:03 -06:00 |
|
 SandPootandGitHub
|
c3735c05ac
|
Merge branch 'master' into throwing-updat
|
2023-10-04 15:15:15 -03:00 |
|