 Ghommie
|
d31075eb54
|
Spellcasting element
|
2020-03-11 16:23:30 +01:00 |
|
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
|
Ghom
|
eaa45d4b35
|
Update implant_hijack.dm
|
2020-02-16 15:48:38 +01:00 |
|
|
Ghommie
|
23ae9996d2
|
Something more about runtime errors.
|
2020-02-16 15:24:15 +01:00 |
|
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
|
kevinz000
|
c29e0e1a1d
|
Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
|
2020-02-10 04:16:14 -07:00 |
|
|
Seris02
|
0b1cb9db6d
|
timer'd
|
2020-02-08 15:25:11 +08:00 |
|
|
Ghommie
|
233ed5873f
|
race conditions and turfs beings special.
|
2020-02-06 01:13:28 +01:00 |
|
|
Seris02
|
6cc6aa12be
|
yeehaw it's done
|
2020-02-05 16:54:57 +08:00 |
|
|
Seris02
|
49f80d52a8
|
bug fixes
|
2020-02-04 17:18:45 +08:00 |
|
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
|
Seris02
|
934c8fe533
|
updates + thingamajig
|
2020-01-23 15:25:45 +08:00 |
|
|
Seris02
|
74be93a8cc
|
hasSiliconAccessInArea vars change
|
2020-01-21 11:44:49 +08:00 |
|
|
Seris02
|
c2bcbe868e
|
merge conflicts + getting rid of commented code for now
|
2020-01-21 11:23:33 +08:00 |
|
|
Seris02
|
5524b0fa03
|
yes.
|
2020-01-20 13:00:24 +08:00 |
|
|
Seris02
|
8da447c678
|
start of stealthmode
|
2020-01-20 09:51:17 +08:00 |
|
|
Seris02
|
fd49c1302b
|
woops
|
2020-01-19 15:55:24 +08:00 |
|
|
Seris02
|
f54417f99e
|
fixes
|
2020-01-19 15:50:48 +08:00 |
|
|
Seris02
|
04b34ec8ed
|
hijack implant
|
2020-01-18 18:04:31 +08:00 |
|
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
kevinz000
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -08:00 |
|
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
|
Artur
|
488c0f1833
|
Mindshield fix and thrall buff
|
2019-12-09 19:08:42 +02:00 |
|
|
Artur
|
4711eb0987
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-07 15:53:11 +02:00 |
|
|
Artur
|
02048ce009
|
Bludsuckers
|
2019-11-29 21:28:14 +02:00 |
|
|
Ghommie
|
d9636398e1
|
Fixes implant pads
|
2019-11-29 20:12:10 +01:00 |
|
|
kevinz000
|
dfa2296758
|
Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-11-14 15:44:59 -07:00 |
|
|
Ghommie
|
91625b6e60
|
item/doMove() calling dropped() callign qdel(src) because of DROPDEL.
|
2019-11-02 14:15:31 +01:00 |
|
|
Ghommie
|
874cdfefb8
|
fixing storage implant transplant.
|
2019-11-02 14:03:14 +01:00 |
|
|
Ghommie
|
b17346a44e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220
|
2019-10-30 14:46:42 +01:00 |
|
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
|
Ghommie
|
7e3a812460
|
Fixing tracking implant teleport issues.
|
2019-10-15 21:32:01 +02:00 |
|
|
Ghommie
|
b95f910a4e
|
macros
|
2019-10-07 17:32:16 +02:00 |
|
|
Ghommie
|
5232728ee7
|
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-10-07 05:25:47 +02:00 |
|
|
Ghommie
|
32a73b24c0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-10-05 18:22:43 +02:00 |
|
|
kevinz000
|
a82f9c011b
|
Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
|
2019-08-02 00:57:05 -07:00 |
|
|
TrilbySpaceClone
|
7ca32cd97f
|
port 2
|
2019-07-29 07:28:38 -04:00 |
|
|
YakumoChen
|
06d9dd8a52
|
!
Box no longer a damage sponge, deletes in one hit
|
2019-07-26 23:55:43 +00:00 |
|
|
Ghommie
|
fac3e65c68
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-07-15 17:42:47 +02:00 |
|
|
kevinz000
|
8ba3609a4d
|
god why fuck
|
2019-06-10 00:07:04 -07:00 |
|
|
kevinz000
|
2f2885f1d6
|
Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
|
2019-06-08 01:26:28 -07:00 |
|
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
|
deathride58
|
8bf5777844
|
Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
|
2019-06-08 01:07:56 -04:00 |
|
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|