 Lin
|
b1ccd512db
|
Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2020-01-03 00:00:51 +00:00 |
|
|
kevinz000
|
74edd7b13f
|
Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
|
2019-12-30 00:09:18 -08:00 |
|
|
Putnam
|
c810145fc1
|
also adds aphrodisiacs, slaps, all hypno as prefs
|
2019-12-20 14:47:09 -08:00 |
|
|
nik707
|
dd62a9ca87
|
Merge pull request #10084 from Hatterhat/i-dont-test-my-code
i dont make good code
|
2019-12-19 14:10:18 -06:00 |
|
|
Putnam
|
f2b46f0951
|
ROBUST OPTING MECHANICS
|
2019-12-19 11:14:02 -08:00 |
|
|
Ghommie
|
5bf252a58c
|
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2019-12-17 01:57:56 +01:00 |
|
|
Putnam
|
3e176bb79a
|
should interrupt always
|
2019-12-08 11:41:08 -08:00 |
|
|
Hatterhat
|
d1bfe3d840
|
i hate
|
2019-12-06 21:43:15 -06:00 |
|
|
Putnam3145
|
1d91e1acf4
|
Merge pull request #10016 from deathride58/mousedropfixes
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
|
2019-11-30 22:51:42 -08:00 |
|
|
Putnam3145
|
44c621e5e9
|
Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
|
2019-11-30 22:22:52 -08:00 |
|
|
deathride58
|
b1fca2b74b
|
Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it
|
2019-11-29 22:59:37 -05:00 |
|
|
Fermi
|
99e9c606c0
|
I dunno what I did but it's fixed... somehow.
|
2019-11-24 04:03:51 +00:00 |
|
|
Fermi
|
614a462176
|
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
This reverts commit 1509d9d183.
|
2019-11-24 03:33:02 +00:00 |
|
|
Fermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
|
Fermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +00:00 |
|
|
Fermi
|
25fe5ec14b
|
Revert "Revert "Alright""
This reverts commit 505e15a3e1.
|
2019-11-24 03:04:37 +00:00 |
|
|
Fermi
|
3155e3ffb3
|
Revert "Revert "Removes the random love""
This reverts commit ce7e9ac452.
|
2019-11-24 03:04:20 +00:00 |
|
|
Fermi
|
1509d9d183
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
|
2019-11-24 03:04:13 +00:00 |
|
|
Fermi
|
c8b206a4cf
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 03:04:04 +00:00 |
|
|
Fermi
|
4c1c257035
|
Revert "Revert "pls""
This reverts commit b23f2a4460.
|
2019-11-24 03:02:21 +00:00 |
|
|
Fermi
|
9eaed4ea8e
|
Revert "pls2"
This reverts commit 0eb635b908.
|
2019-11-24 03:02:04 +00:00 |
|
|
Fermi
|
0eb635b908
|
pls2
ugh
|
2019-11-24 02:52:17 +00:00 |
|
|
Fermi
|
b23f2a4460
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 02:49:20 +00:00 |
|
|
Fermi
|
8c97511871
|
pls
ugh
|
2019-11-24 02:47:52 +00:00 |
|
|
Fermi
|
135608551f
|
Merge remote-tracking branch 'upstream/master'
|
2019-11-24 02:45:28 +00:00 |
|
|
Fermi
|
ce7e9ac452
|
Revert "Removes the random love"
This reverts commit b056d91ea5.
|
2019-11-24 02:45:06 +00:00 |
|
|
Fermi
|
505e15a3e1
|
Revert "Alright"
This reverts commit b756f37ff6.
|
2019-11-24 02:44:10 +00:00 |
|
|
Fermi
|
00601a0c87
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 02:44:00 +00:00 |
|
|
Fermi
|
8af225e6e3
|
PLASE
|
2019-11-24 02:41:21 +00:00 |
|
|
Fermi
|
b756f37ff6
|
Alright
|
2019-11-23 01:05:42 +00:00 |
|
|
Fermi
|
b404e18b15
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-11-23 00:10:33 +00:00 |
|
|
Fermi
|
b056d91ea5
|
Removes the random love
|
2019-11-22 23:48:21 +00:00 |
|
|
Thalpy
|
7b17bf2acd
|
god damn bitflags ARGH
|
2019-11-21 20:30:49 +00:00 |
|
|
Thalpy
|
46076c95c7
|
Ghommie is a good friend
|
2019-11-21 14:22:04 +00:00 |
|
|
kevinz000
|
8df8acb1b7
|
Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
|
2019-11-20 21:49:58 -07:00 |
|
|
Fermi
|
01f465dc8c
|
Scanner formatting
|
2019-11-21 03:52:00 +00:00 |
|
|
Fermi
|
cc53a0061f
|
Well it compiles
|
2019-11-21 02:15:58 +00:00 |
|
|
kevinz000
|
4c89b8c33f
|
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
|
2019-11-14 16:00:45 -07:00 |
|
|
Ghommie
|
358db4f390
|
Dreamchecker compatibility changes, part 2.
|
2019-11-14 14:54:12 +01:00 |
|
|
TrilbySpaceClone
|
73661cfe52
|
more fixing+ chem selling tweaks
|
2019-11-13 09:39:42 -05:00 |
|
|
Ghommie
|
e977ba6729
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-10 23:17:58 +01:00 |
|
|
Putnam
|
b0b3c24aab
|
makes SDGF transfer notes/memories.
|
2019-11-04 16:12:52 -08:00 |
|
|
Ghommie
|
29daa0c908
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-04 22:59:24 +01:00 |
|
|
kevinz000
|
d9c38d0589
|
Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
|
2019-10-31 17:27:03 -07:00 |
|
|
Ghommie
|
a5b37b658b
|
Purging a lot of space indention in favor of tabs.
|
2019-10-29 15:46:31 +01:00 |
|
|
Ghommie
|
bf92aa2ffb
|
Unmodularize MkII hyposprays and other reagent items sprites.
|
2019-10-26 19:14:28 +02:00 |
|
|
Ghommie
|
79c3700d25
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-25 12:42:28 +02:00 |
|
|
Ghommie
|
a50606bb67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
|
2019-10-24 10:10:07 +02:00 |
|
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
|
Thalpy
|
67af19a7f0
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-17 16:20:38 +01:00 |
|