SandPoot
2d87780147
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-02-13 18:06:56 -03:00
SandPoot
56d972eb0b
all sorts of fixes and updates, may break stuff
2025-02-09 02:09:28 -03: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
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
SandPoot
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
SandPoot
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
SandPoot
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
SandPoot
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
SandPoot
d55d628efe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-08 21:34:03 -03:00
silicons and GitHub
d2f3ff4d11
Update holy_weapons.dm
2021-09-12 20:23:00 -07:00
silicons and GitHub
57b6946fbb
Update holy_weapons.dm
2021-09-12 20:18:48 -07:00
silicons and GitHub
037f466a47
Update holy_weapons.dm
2021-09-12 20:12:31 -07:00
silicons and GitHub
7aae90a360
Update holy_weapons.dm
2021-09-12 20:05:47 -07:00
silicons and GitHub
baa8d26428
Update holy_weapons.dm
2021-09-12 20:03:26 -07:00
silicons and GitHub
c038529677
Update holy_weapons.dm
2021-09-12 19:55:20 -07:00
SandPoot
20f2177ccf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-02-26 12:48:13 -03:00
silicons and GitHub
504a36f50d
Update holy_weapons.dm
2021-02-24 01:36:03 -07:00
SandPoot
67ad6cbbb8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-01-15 19:03:13 -03:00
corin9090 and GitHub
9f0280309d
Belt slot prayer beads
...
uwu
2021-01-13 09:24:55 -08:00
SandPoot
c66ae014ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-11-13 14:49:27 -03:00
Artur
503d0156c6
Does the thing
2020-11-08 23:24:58 +02:00
SandPoot and GitHub
13834c4bef
Morrowinventory Port ( #75 )
2020-09-24 20:14:53 -03:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
timothyteakettle
584e74590f
port1
2020-07-17 02:01:33 +01:00
bunny232
afe9b2dfbd
Update holy_weapons.dm
2020-06-30 11:15:40 -04:00
Ghommie
2858ddd90b
Porting "Refactors language holder"
2020-05-08 22:44:02 +02:00
Detective Google
0c2f0a99d5
fixes the fact that some citadel null rods aren't null rod subtypes
2020-04-19 17:18:40 -05:00
Detective Google
5376ca81b5
Turns chaplain null rod selection into a radial function(port TG#50512)
2020-04-19 16:57:02 -05:00
Ghommie
fe43581d31
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
2020-04-16 15:09:52 +02:00
Ghommie
42ff9b1d35
Final test, fixes and parent calls.
2020-04-14 01:23:26 +02:00
Ghommie
05a954f000
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 02:01:01 +02:00
Ghommie
7c1e5aa2c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-09 15:46:19 +02:00
Ghommie
d2b624a908
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
2020-04-09 14:59:40 +02:00
Lin and GitHub
8379169b81
Merge pull request #11476 from kevinz000/shield_refactor
...
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
Ghommie
56669f9296
Minor snowflakes clothing variations refactor. Removal of copypasted states.
2020-04-04 00:22:18 +02:00
Ghommie
45d1917f0f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-02 16:07:13 +02:00
Putnam3145 and GitHub
658701bf37
Various ghost role QoL; moving holding facility; removing energy net ( #11676 )
...
* Removed gay baby jail net from ninja
* Made a proper holding facility for syndicate contractors
* Made ghost role eligibility able to allow reghosting.
* Added a medibot to the holding facility.
* Added new comsigs to every other ghost proc
* Properly dummied out capture objective
2020-03-31 22:04:55 +02:00
Ghommie
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
kevinz000
a6ca854e5c
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-22 15:07:41 -07:00
Putnam3145 and GitHub
368d47aa69
Adds ghost role eligibility to various ghost roles. ( #11549 )
...
* Added ghost role eligibility to CTF, possession, random animal
* Also added possessed blade to it.
* Also removed some extraneous dead/observer things.
* ahaha whoops
2020-03-22 13:02:23 +01:00
kevinz000
6af9c54da5
better
2020-03-16 04:59:55 -07:00
kevinz000
763c835a53
bitflags not equals
2020-03-16 04:26:19 -07:00
kevinz000
d32bff7815
return list
2020-03-16 03:35:10 -07:00
kevinz000
703fca5f90
add owner argument
2020-03-16 03:24:19 -07:00
kevinz000
9ead492bb0
changes
2020-03-16 00:28:18 -07:00
SandPoot