necromanceranne
|
43c4debb4f
|
Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits.
|
2020-01-31 11:54:18 +11:00 |
|
kevinz000
|
603ab65ed1
|
Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
|
2020-01-25 19:33:26 -07:00 |
|
Putnam3145
|
a08cd7c046
|
Merge pull request #10718 from r4d6/HE-Fix
Fix HE Manifold's sprites
|
2020-01-25 14:31:11 -08:00 |
|
r4d6
|
d5c09f11bc
|
Fix
|
2020-01-25 17:23:00 -05:00 |
|
kevinz000
|
c0b7541e62
|
Merge pull request #10691 from Seris02/mentorfix
very very tentative fix for the make mentor button
|
2020-01-25 08:08:32 -07:00 |
|
Ghom
|
db8abcd7fb
|
Merge pull request #10688 from Citadel-Station-13/kevinz000-patch-1
Fixes SOME of the problems with hilbert hotel
|
2020-01-25 15:32:21 +01:00 |
|
Ghom
|
4b6a601af7
|
Merge pull request #10646 from Poojawa/blindvorefixnumber244
Resolves Minor issues with vore code
|
2020-01-25 15:27:12 +01:00 |
|
Ghom
|
00667eeecd
|
Merge pull request #10698 from Putnam3145/ghost-dojo-ban
Made ghost cafe mobs dust upon leaving, allowed ghost cafe bans
|
2020-01-25 15:25:26 +01:00 |
|
kevinz000
|
2acb52fb56
|
Merge pull request #10690 from Ghommie/Ghommie-cit525
Additional runtime fixes.
|
2020-01-25 05:54:35 -07:00 |
|
kevinz000
|
f199b720aa
|
Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
|
2020-01-25 05:54:20 -07:00 |
|
kevinz000
|
a5404f6063
|
Merge pull request #10687 from Ghommie/Ghommie-cit523
A few more, ported, runtime fixes.
|
2020-01-25 05:54:03 -07:00 |
|
kevinz000
|
72cfd35438
|
Merge pull request #10684 from Ghommie/Ghommie-cit521
fix for hypospray jank.
|
2020-01-25 05:53:42 -07:00 |
|
kevinz000
|
72a8096137
|
Merge pull request #10683 from Ghommie/Ghommie-cit520
A few consistencies for those "shoes" that don't actually cover feet.
|
2020-01-25 05:53:26 -07:00 |
|
kevinz000
|
26459a156d
|
Merge pull request #10682 from Ghommie/Ghommie-cit519
Ports "Makes falsewall hide pipes and wires"
|
2020-01-25 05:53:07 -07:00 |
|
kevinz000
|
ac6695bd68
|
Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
|
2020-01-24 16:15:44 -07:00 |
|
kevinz000
|
147c0d8852
|
Merge pull request #10680 from Ghommie/Ghommie-cit518
snowflake-friendly towels.
|
2020-01-24 16:15:27 -07:00 |
|
kevinz000
|
afe8e00bdf
|
Merge pull request #10677 from Ghommie/Ghommie-cit515
Fixes dead malf AIs being able to doomsday, plus a few ported updates.
|
2020-01-24 16:14:49 -07:00 |
|
kevinz000
|
ea9513864d
|
Merge pull request #10674 from Xantholne/lunar01
Culturally Appropriate Lunar Clothes
|
2020-01-24 16:14:32 -07:00 |
|
Ghom
|
2884bbdc23
|
I'm exiting this code. 👀
|
2020-01-24 22:15:33 +01:00 |
|
Ghom
|
ba50b4a851
|
Risky web edit, disgusting contents.
|
2020-01-24 22:13:55 +01:00 |
|
Ghommie
|
6fe0c57c42
|
run-extra-times fixes.
|
2020-01-24 20:48:32 +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
|
0493db0ac6
|
allowed dojo banning, made dojo mobs dust upon leaving
|
2020-01-24 09:11:33 -08:00 |
|
Ghom
|
f5d8e447eb
|
Merge pull request #10676 from Kraseo/virgohairs
Reorganises/fixes virgo hairs
|
2020-01-24 16:39:10 +01: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
|
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
|
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
|
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
|
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
|
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 |
|
Seris02
|
90c7149d8c
|
merge conflict fixes
|
2020-01-24 10:27:48 +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
|
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 |
|
Ghommie
|
05150e821e
|
A few consistencies for those "shoes" that don't actually cover feet.
|
2020-01-24 01:25:23 +01: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
|
56d31b0c8c
|
neuter/plural gender fixes.
|
2020-01-23 22:50:30 +01:00 |
|