kevinz000
|
5832b4d9b0
|
nvm
|
2020-01-24 04:21:41 -07:00 |
|
kevinz000
|
264431d3c8
|
Update _logging.dm
|
2020-01-24 04:15:35 -07:00 |
|
kevinz000
|
1043be4fd7
|
Update holder.dm
|
2020-01-24 04:14:43 -07:00 |
|
kevinz000
|
7649bf423e
|
Update world.dm
|
2020-01-24 04:13:59 -07:00 |
|
kevinz000
|
74a3b4e656
|
Update logging.dm
|
2020-01-24 04:13:20 -07:00 |
|
kevinz000
|
d2a23ef403
|
Update holder.dm
|
2020-01-24 04:11:37 -07:00 |
|
kevinz000
|
388e98bd67
|
revert atmos/helpers
|
2020-01-24 03:43:52 -07:00 |
|
kevinz000
|
d9a5d12c63
|
Revert atmos
|
2020-01-24 03:42:55 -07:00 |
|
kevinz000
|
bedb42f147
|
Merge remote-tracking branch 'citadel/master' into optimization_1
|
2020-01-24 03:41:40 -07:00 |
|
kevinz000
|
8816a8b3e4
|
i did a thing yay me
|
2020-01-24 03:34:53 -07:00 |
|
kevinz000
|
970f6f54ad
|
ok
|
2020-01-24 03:17:42 -07:00 |
|
Seris02
|
10ef39d1e3
|
maybe it'll work
|
2020-01-24 16:33:20 +08:00 |
|
kevinz000
|
f626322fbd
|
Merge pull request #10650 from Arturlang/patch-5
[READY]Adds cheap modular computers to the loadout
|
2020-01-24 00:32:57 -07:00 |
|
kevinz000
|
928a8ceea3
|
Merge pull request #10628 from Citadel-Station-13/Ghommie-patch-1
Quick rubber toolbox materials fix.
|
2020-01-24 00:26:22 -07:00 |
|
kevinz000
|
831ac91917
|
Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
|
2020-01-24 00:25:53 -07:00 |
|
kevinz000
|
f8ec01676a
|
Merge pull request #10609 from Putnam3145/cold-blooded-buff
Moved cold-blooded to negative, made it cost -2
|
2020-01-24 00:22:08 -07:00 |
|
kevinz000
|
7cd6490e86
|
Merge pull request #10526 from Seris02/bowmanupgrade
allows headsets to be bowmanized and adds a traitor item for that
|
2020-01-24 00:21:34 -07:00 |
|
kevinz000
|
07277436ac
|
Merge pull request #10665 from Ghommie/Ghommie-cit513
Fixes chainsaw force being set to 0 on drop.
|
2020-01-24 00:20:26 -07:00 |
|
kevinz000
|
6ffdc1642b
|
Merge pull request #10632 from Commandersand/nerd
buffs some wiz spell cooldonws and changes some incantation phrases
|
2020-01-24 00:18:41 -07:00 |
|
kevinz000
|
2a706ceb05
|
Merge pull request #10664 from kappa-sama/patch-17
makes cursed dragnet take 5 seconds instead of 30 to break out of
|
2020-01-24 00:18:05 -07:00 |
|
kevinz000
|
a5ddd4efa9
|
Update hilbertshotel.dm
|
2020-01-24 00:01:02 -07:00 |
|
loginsandylogout
|
a7a3a3a417
|
Update code/modules/spells/spell_types/lightning.dm
po
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-23 22:52:18 -06:00 |
|
Ghommie
|
6677e82195
|
Turf magic and people spamclicking.
|
2020-01-24 05:19:47 +01:00 |
|
Ghommie
|
a6c3917bfc
|
M H M H
|
2020-01-24 05:01:51 +01:00 |
|
Ghommie
|
95a2479c6a
|
Additional runtime fixes.
|
2020-01-24 04:59:56 +01:00 |
|
Ghommie
|
bd6e364612
|
But wait, there is more!
No...
|
2020-01-24 04:33:55 +01:00 |
|
Ghommie
|
1ba4c19c64
|
A couple more.
|
2020-01-24 03:50:44 +01:00 |
|
Ghommie
|
67f58b8a59
|
A few more runtime fixes.
|
2020-01-24 03:30:34 +01:00 |
|
kevinz000
|
2e49513439
|
ok
|
2020-01-23 19:29:41 -07:00 |
|
Seris02
|
90c7149d8c
|
merge conflict fixes
|
2020-01-24 10:27:48 +08:00 |
|
kevinz000
|
40a2698b55
|
Update emergency.dm
|
2020-01-23 19:22:00 -07:00 |
|
kevinz000
|
289bb590cf
|
changes
|
2020-01-23 19:20:35 -07:00 |
|
kevinz000
|
770e9eca4e
|
Update game.dm
|
2020-01-23 19:15:02 -07:00 |
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08:00 |
|
kevinz000
|
99d6d589ac
|
Update hilbertshotel.dm
|
2020-01-23 19:07:39 -07:00 |
|
kevinz000
|
65871ca1d3
|
Update hilbertshotel.dm
|
2020-01-23 19:07:17 -07:00 |
|
kevinz000
|
5ce80078ab
|
Update hilbertshotel.dm
|
2020-01-23 19:03:26 -07:00 |
|
Ghommie
|
721fd108f9
|
A few more, ported, runtime fixes.
|
2020-01-24 03:02:07 +01:00 |
|
Ghommie
|
9ee70c7931
|
Travis is just faster at compiling, I can work on other things meanwhile
|
2020-01-24 02:34:32 +01:00 |
|
Ghommie
|
7d5725e450
|
a dot
|
2020-01-24 02:31:46 +01:00 |
|
Ghommie
|
78934c52fe
|
A handful of runtime fixes.
|
2020-01-24 02:27:06 +01:00 |
|
Ghommie
|
ba2c149d4d
|
Improvements.
|
2020-01-24 02:22:32 +01:00 |
|
Ghommie
|
6b62aef86c
|
Missing !
|
2020-01-24 02:19:52 +01:00 |
|
Ghommie
|
524f665f4a
|
fix for hypospray jank.
|
2020-01-24 02:17:41 +01:00 |
|
kevinz000
|
e7bf1738cd
|
ok putnom
|
2020-01-23 18:00:33 -07:00 |
|
Ghommie
|
05150e821e
|
A few consistencies for those "shoes" that don't actually cover feet.
|
2020-01-24 01:25:23 +01:00 |
|
kevinz000
|
5cbe2226e1
|
Merge remote-tracking branch 'citadel/master' into hijack
|
2020-01-23 17:15:49 -07:00 |
|
Ghommie
|
8e5f221bb9
|
Ports "Makes falsewall hide pipes and wires"
|
2020-01-24 00:57:27 +01:00 |
|
Ghommie
|
c8bf148216
|
snowflake-friendly towels.
|
2020-01-24 00:06:07 +01:00 |
|
Ghommie
|
3211ed6d10
|
Better position.
|
2020-01-23 23:19:39 +01:00 |
|