Fermi
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
Fermi
31709938c6
Pushing a buncha stuff so I can fix things.
2019-07-28 23:23:45 +01:00
kevinz000
e79bf3ab07
Merge pull request #8969 from Sishen1542/hypofix
...
chemmaster now spits out 60u hypovials
2019-07-27 21:54:36 -07:00
BlackMajor
c8d2410f0e
Merge pull request #8961 from Citadel-Station-13/kevinz000-patch-58
...
Fixes subtler anti ghost
2019-07-28 02:32:42 +12:00
Sishen
68083aa0c6
a
2019-07-25 21:43:02 -04:00
Sishen
a4529491ea
Update color.dm
2019-07-25 21:43:02 -04:00
Sishen
1a92134ad3
b
2019-07-25 21:43:02 -04:00
Sishen
612021b9d5
h
2019-07-25 21:43:02 -04:00
kevinz000
e323925fd5
Merge pull request #8911 from Ghommie/Ghommie-cit145
...
Porting a couple atmos performance code improvements.
2019-07-25 17:44:17 -07:00
kevinz000
692f2322c0
Merge pull request #8928 from Ghommie/Ghommie-cit121
...
Reverts a commit that reverted a fix.
2019-07-25 17:43:14 -07:00
kevinz000
e0c92e023c
Merge pull request #8931 from Trilbyspaceclone/cargo_memes_2
...
3 New cargocrates - Security EVA jetpacks, woodstock shotguns, and russian clothing + guns (that totally is balanced)
2019-07-25 17:42:45 -07:00
Sishen
a1a626ba29
hypovial shit
...
iddqd
2019-07-25 19:11:58 -04:00
kevinz000
e65d51f493
Update say_vr.dm
2019-07-24 17:31:24 -07:00
kevinz000
eef852aa9a
Update mob.dm
2019-07-24 17:10:44 -07:00
kevinz000
8c6b1c8e95
Update say_vr.dm
2019-07-24 17:05:20 -07:00
kevinz000
0f58585e5d
Merge pull request #8939 from Ghommie/Ghommie-cit154
...
Fixing towels and improving them.
2019-07-23 20:34:09 -07:00
kevinz000
1028fe458a
Merge pull request #8909 from Ghommie/Ghommie-cit143
...
Fixes named arg Knockdown calls.
2019-07-22 20:17:30 -07:00
kevinz000
f114094138
Merge pull request #8926 from Thalpy/Secbats
...
Secbats
2019-07-22 20:15:36 -07:00
Ghommie
c06c1d9b60
typo.
2019-07-21 12:11:18 +02:00
Ghommie
ce4e86279c
Further improvements.
2019-07-21 11:58:58 +02:00
Ghommie
5504fb6a6a
Alt click examine string.
2019-07-21 11:27:26 +02:00
Ghommie
2f46b68e11
switching to non combat mode attack_self() and AltClick(), less clunky.
2019-07-21 11:22:19 +02:00
Ghommie
e8584720b3
Fixes suit worn overlay for towels.
2019-07-21 11:18:38 +02:00
Ghommie
1a47fedade
More intuitive, way less weird edge cases.
2019-07-21 10:26:16 +02:00
Ghommie
fc78d02242
Fixing towels and improving them.
2019-07-21 09:58:54 +02:00
Thalpy
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
Fermi
4f2406ee3a
Made it a critterbox instead.
2019-07-20 20:55:46 +01:00
Fermi
c2b3df34c1
Cargobox.
2019-07-20 20:46:50 +01:00
kevinz000
c657244d9b
Merge pull request #8920 from Ghommie/Ghommie-cit149
...
Towels.
2019-07-20 12:06:54 -07:00
kevinz000
66ddaf3ae8
Merge pull request #8903 from Trilbyspaceclone/patch-192
...
Re-words brass flasks to not be wrong
2019-07-20 11:59:30 -07:00
kevinz000
ab3c5acb0e
Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT
...
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
2019-07-20 11:59:05 -07:00
kevinz000
08fd6af7fc
Merge pull request #8830 from Ghommie/Ghommie-cit114
...
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
kevinz000
3176cf958f
Merge pull request #8917 from deathride58/fuckwarpwhistles
...
Fixes warp whistles
2019-07-20 11:54:48 -07:00
kevinz000
f649920b49
Merge pull request #8898 from WhiteHusky/batch-check-injuries
...
Batch check injuries
2019-07-20 11:52:45 -07:00
TrilbySpaceClone
0a8954c2d6
Update packs.dm
2019-07-19 23:53:12 -04:00
TrilbySpaceClone
d981b756e3
Update packs.dm
2019-07-19 23:49:53 -04:00
Fermi
e5648fd471
Made bat part of previous bat type.
2019-07-19 22:57:22 +01:00
Fermi
75d6768ba7
Changed how the box works so it's not a storage.
2019-07-19 22:12:05 +01:00
Ghommie
7065a86841
Revert "Revert "Fixes rocket launchers, buffing their accuracy etc.""
2019-07-19 22:02:22 +02:00
Fermi
4ab5060596
Adds secbats (tested)
2019-07-19 17:07:02 +01:00
Fermi
fbf542134a
Cidadel makes me want to hurt myself.
2019-07-19 05:18:35 +01:00
Fermi
a5fcb918aa
Astrogen tweaks and cat fixes.
2019-07-19 04:11:26 +01:00
Ghommie
44063e523d
missing flag.
2019-07-18 02:14:00 +02:00
Ghommie
4e6554076c
item flags, not clothing flags.
2019-07-18 00:16:14 +02:00
kevinz000
28ac38d800
Merge pull request #8910 from Ghommie/Ghommie-cit144
...
Ports "Removes some getflaticon calls from things that don't draw browser interfaces"
2019-07-17 15:08:36 -07:00
kevinz000
884299e152
Merge pull request #8915 from Ghommie/Ghommie-cit148
...
Gives cult conversions an alert popup and four extra seconds wait time.
2019-07-17 15:07:38 -07:00
Ghommie
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
deathride58
edbcabdce4
Merge pull request #8836 from Citadel-Station-13/kevinz000-patch-55
...
nanite metabolic synthesis now drains you until you're starving
2019-07-17 17:55:27 -04:00
deathride58
adaac8322c
Merge pull request #8589 from Citadel-Station-13/kevinz000-patch-47
...
buffs pepperspray to hardstun (knockdown + drop items) for 0.1 ds because for some reason we don't have a standalone knockdown without hardstun when are we porting the /tg/ mobility flags that I made?
2019-07-17 17:53:39 -04:00
deathride58
80b1383362
Merge pull request #8865 from Citadel-Station-13/kevinz000-patch-53
...
adds an adminspawned nanite hub that draws from admin techweb datum instead
2019-07-17 17:50:46 -04:00
