Artur
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
Trilbyspaceclone
5833ed8029
Merge branch 'master' into tools_andstuff
2020-04-14 10:10:32 -04:00
Ghom
49e36e47ff
Merge pull request #11809 from kevinz000/storage_rework
...
Adds baystation-style volumetric space storage support
2020-04-14 13:17:11 +02:00
Ghommie
983f369357
Little Holodeck refactor.
2020-04-12 01:49:25 +02:00
kevinz000
f3537f38e6
shield bashing
2020-04-11 07:09:50 -07:00
kevinz000
f8a7a68ac3
lmao
2020-04-11 05:52:37 -07:00
kevinz000
f652a612e5
missing comma
2020-04-10 22:18:53 -07:00
kevinz000
3788496204
multiline support
2020-04-10 12:42:50 -07:00
Artur
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
TrilbySpaceClone
1f51e73dd6
more rng
2020-04-07 08:43:18 -04:00
Putnam3145
5108bf1fc3
Stuff about power ( #11664 )
...
* Overhauled how APCs work, I guess
* Makes cells drain like before
2020-04-06 04:26:14 +02:00
Ghommie
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
kevinz000
0e3193e929
relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important ( #11376 )
...
* combat refactoring
* i hate this
* mobility flags part 2 time xd
* whew
* stuff
* a
* ok
* changes
* Wew
* k
* add flags
* FUCKYOUVORE
* fixes
* typo
* no using this in hard stamcrit
* update icon
* woopsy
* . = ..()
* sigh
* Update living_combat.dm
* wew
* wups
* fix
* i hate you
* wrong button
* k
* ok
* bet
* k
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* early returns
* skreee
* agony
* k
* k
* k
* k
* wack
* compile
* wack
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-21 16:04:26 +01:00
kevinz000
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07: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
keronshb
7e1e905a95
Line ending changes, I hope
...
here goes nothing.
2020-03-08 20:36:05 -04:00
keronshb
0d3da4fcc0
maybe? last go? 2
...
Should be the final part I hope
2020-03-08 20:11:13 -04:00
keronshb
94958581b9
maybe? last go?
...
maybe? last go?
2020-03-08 20:10:34 -04:00
keronshb
d460f5359e
Hopefully this will fix it?
...
Hopefully this will fix it?
2020-03-08 18:49:18 -04:00
keronshb
9b63c7aa11
Trying to see if this will fix the line end issue
...
Trying to see if this will fix the line end issue
2020-03-08 18:48:42 -04:00
keronshb
228012c718
Blob refactor ( #43872 )
...
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
Kraseo
ad20fb1a0e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-06 11:58:11 +01:00
Kraseo
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
kevinz000
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
Ghommie
2b740f9bad
[s] Fixing an issue with slot machines crashing the server.
2020-02-23 13:09:21 +01:00
Seris02
c3ec44b0d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-02-22 19:54:10 +08: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
34fbcd1dc0
fixes
2020-02-19 07:49:05 -07:00
kevinz000
d2398f4584
Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2
...
Porting agent card updates and registered name fix.
2020-02-15 11:45:39 -07:00
Ghom
ad639d5f2f
Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7
...
!tgs valentine
2020-02-15 09:04:29 +01:00
Seris02
2d9c8ce8fc
fixing merge conflicts
2020-02-15 15:41:52 +08:00
kevinz000
f36b89a6e3
Update misc.dm
2020-02-14 11:53:50 -07:00
kevinz000
efc94565b6
Update misc.dm
2020-02-14 00:40:50 -07:00
kevinz000
e9baf17233
Update misc.dm
2020-02-14 00:40:19 -07:00
Artur
7964d768fa
Initial Commit
2020-02-13 20:51:52 +02:00
Ghom
bcc7949034
Update names.dm
2020-02-13 18:02:42 +01:00
Seris02
ee7064840d
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
Ghommie
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
Ghom
6f66d76680
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
...
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
Arturlang
83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
kevinz000
24cbe67f27
optimizations, unnecessary crap, undocumented ipc change
2020-01-24 21:18:19 -07:00
kevinz000
74a3b4e656
Update logging.dm
2020-01-24 04:13:20 -07:00
Artur
f5ad854c2c
Conflict fix
2020-01-20 13:50:52 +02:00
Seris02
718ff58e0b
fixes + advanced injectors
2020-01-19 15:17:57 +08:00
Ghom
07b3bac674
Merge pull request #10580 from Putnam3145/craft-log
...
Craft logging
2020-01-18 17:47:31 +01:00
Putnam
a4cc73f219
some craft logging
2020-01-16 18:40:00 -08:00
Artur
8b8a112d2c
Ohkay
2020-01-15 09:41:33 +02:00
Seris02
16b5c83a3a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-13 12:53:52 +08:00
