 Metis
|
dfa4c19346
|
important cloning change
|
2024-09-23 16:08:58 -04:00 |
|
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03:00 |
|
|
SandPoot
|
586a035132
|
Update files
|
2022-04-06 18:41:31 -03: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 |
|
|
silicons
|
3070f178e0
|
Merge remote-tracking branch 'citadel/master' into combat_patches_1
|
2021-07-18 15:12:52 -07:00 |
|
|
silicons
|
8710731b87
|
tweaks
|
2021-07-01 20:42:55 -07:00 |
|
|
Putnam3145
|
0bf383a90b
|
does this fix it
|
2021-06-21 09:18:06 -07:00 |
|
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
|
Timothy Teakettle
|
f1cd94fc97
|
emp rework
|
2020-09-09 23:14:06 +01:00 |
|
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
|
Lin
|
955d9fa0cc
|
Merge pull request #12624 from Citadel-Station-13/policy
policy configuration & support hooks for clone memory disorder
|
2020-07-11 16:40:38 -05:00 |
|
|
Artur
|
9de8483bcf
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-09 22:14:20 +03:00 |
|
|
Artur
|
0a9dc33ce1
|
Reverts cloning changes
|
2020-07-08 23:42:47 +03:00 |
|
|
Ghommie
|
562b57095d
|
mowing down the experimental cloner copypasta.
|
2020-07-05 03:04:53 +02:00 |
|
|
Ghommie
|
780f30bd4d
|
Fixing cloning
|
2020-07-04 21:01:44 +02:00 |
|
|
silicons
|
e2975a44a1
|
Merge branch 'master' into policy
|
2020-07-02 01:23:19 -07:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
|
silicons
|
2ea030ca3e
|
fix
|
2020-06-26 23:53:52 -07:00 |
|
|
silicons
|
1d4a54d880
|
log
|
2020-06-26 23:47:16 -07:00 |
|
|
silicons
|
0df5aa083b
|
policies and code hooks
|
2020-06-26 23:41:44 -07:00 |
|
|
Ghommie
|
e51ac4e745
|
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-05-29 17:58:35 +02:00 |
|
|
Artur
|
dabdf16eac
|
Coonflict fiiixeeess
|
2020-05-13 12:56:17 +03:00 |
|
|
Artur
|
5b7d9a9008
|
Merge conflict fix
|
2020-05-13 12:37:18 +03:00 |
|
|
Ghommie
|
94f014589d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-25 17:09:34 +02:00 |
|
|
Artur
|
9d870893fb
|
Beginning work on DNA console TGUI, plus some camera console fixes
|
2020-04-23 13:24:43 +03:00 |
|
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
|
Artur
|
fb7dc7a54c
|
Fucking icons
|
2020-04-14 09:42:11 +03:00 |
|
|
Artur
|
356f2913d7
|
Ghommies suggestions and renames a proc
|
2020-04-14 09:30:14 +03:00 |
|
|
Artur
|
a903752ff9
|
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
|
2020-03-31 19:42:35 +03:00 |
|
|
kevinz000
|
6e140f003c
|
cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside (#11691)
* Update cloning.dm
* Update traits.dm
* Update life.dm
* Update code/__DEFINES/traits.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-30 23:24:51 +02:00 |
|
|
Artur
|
9bb7529a49
|
Progress
|
2020-03-24 16:55:46 +02:00 |
|
|
Artur
|
c6a8515297
|
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
|
2020-03-24 12:36:21 +02:00 |
|
|
Ghommie
|
8ccd0d2cbc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595
|
2020-03-12 20:31:14 +01:00 |
|
|
Seris02
|
cccd0e9eef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-03-09 16:49:32 +08:00 |
|
|
Ghommie
|
23cbb05578
|
Merge branch 'Ghommie-cit597' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit597
|
2020-03-02 16:33:56 +01:00 |
|
|
Ghommie
|
f915d14a58
|
Also cell chargers and cloning pods.
|
2020-03-02 16:28:31 +01:00 |
|
|
Ghom
|
4d4708a6ae
|
Update cloning.dm
|
2020-03-02 01:28:20 +01:00 |
|
|
Ghommie
|
efaa99ae27
|
some dozens lines about PDA/update_overlays and cryopods/MMIs.
|
2020-03-01 23:17:35 +01:00 |
|
|
Ghommie
|
bcc1c954c8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595
|
2020-02-29 15:16:43 +01:00 |
|
|
Ghommie
|
bd87d46ce6
|
Deletes the preferences_vore datum and migrates its contents to preferences.
|
2020-02-29 15:07:44 +01:00 |
|
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
|
Artur
|
74d6473c3b
|
Initial Commit
Changes isvamp() to isbloodsucker(), adds a isvampire() check for the race itself, reworks regen cores codewise, adds a defib check for bloodsuckers
|
2020-02-25 17:07:40 +02:00 |
|
|
Seris02
|
ee7064840d
|
merge conflicts fixed finally
|
2020-02-05 18:42:16 +08:00 |
|
|
Ghommie
|
8de11845d5
|
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-02 03:39:49 +01:00 |
|
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08:00 |
|
|
kevinz000
|
a53511a53d
|
Update cloning.dm
|
2020-01-20 11:28:27 -07:00 |
|
|
Hatterhat
|
590d71ddc1
|
hey ghom i fixed it i think
|
2020-01-18 23:35:52 -06:00 |
|