 Putnam
|
847b3c0a09
|
Fixed flavor objectives and added more.
|
2020-01-24 10:46:07 -08:00 |
|
|
Ghommie
|
c69032ff42
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374
|
2020-01-24 18:56:27 +01:00 |
|
|
Artur
|
ff8289c177
|
Fixes
|
2020-01-24 18:48:50 +01:00 |
|
|
Ghom
|
d5daae98c7
|
Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
|
2020-01-24 18:46:25 +01:00 |
|
|
Putnam
|
11b5881721
|
wait no this should be 2
|
2020-01-24 09:15:43 -08:00 |
|
|
Putnam
|
0493db0ac6
|
allowed dojo banning, made dojo mobs dust upon leaving
|
2020-01-24 09:11:33 -08:00 |
|
|
Ghom
|
d3531aade2
|
Makes transfer_ckey crash logging less pedant.
|
2020-01-24 17:06:38 +01:00 |
|
|
Ghom
|
f5d8e447eb
|
Merge pull request #10676 from Kraseo/virgohairs
Reorganises/fixes virgo hairs
|
2020-01-24 16:39:10 +01:00 |
|
|
Ghom
|
9013c7aa9c
|
Merge pull request #10630 from Citadel-Station-13/kevinz000-patch-17
Nerfs cloning
|
2020-01-24 16:23:28 +01:00 |
|
|
kevinz000
|
3b51c0dbe9
|
how did i get maintainer again
|
2020-01-24 04:48:24 -07:00 |
|
|
kevinz000
|
ea43724fc5
|
Update game.dm
|
2020-01-24 04:45:53 -07:00 |
|
|
kevinz000
|
73975aec2b
|
pls compile i didn't webedit that last commit please forgive my sins!!
|
2020-01-24 04:39:51 -07:00 |
|
|
kevinz000
|
fc684da88d
|
more reasonable
|
2020-01-24 04:31:54 -07:00 |
|
|
kevinz000
|
93a27d05b4
|
Revert "nvm"
This reverts commit 5832b4d9b0.
|
2020-01-24 04:22:24 -07:00 |
|
|
kevinz000
|
60365e4a8c
|
Revert "Revert "Update _logging.dm""
This reverts commit 2b93d5c3dd.
|
2020-01-24 04:22:16 -07:00 |
|
|
kevinz000
|
2b93d5c3dd
|
Revert "Update _logging.dm"
This reverts commit 264431d3c8.
|
2020-01-24 04:22:08 -07:00 |
|
|
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 |
|
|
kevinz000
|
99d6d589ac
|
Update hilbertshotel.dm
|
2020-01-23 19:07:39 -07:00 |
|