Ghom
f94f997cc2
Merge pull request #11080 from kevinz000/surubatons
...
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
2020-02-20 11:09:46 +01:00
Ghommie
1a0fba8a2a
Something about consistency and magnetic rifles.
2020-02-16 18:37:51 +01:00
kevinz000
f79148d549
Merge pull request #10947 from Ghommie/Ghommie-cit563
...
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
kevinz000
b9e8be5784
Merge pull request #10940 from Ghommie/Ghommie-cit560
...
First tweak to cargo reagents selling.
2020-02-15 12:15:50 -07:00
kevinz000
b705e2fe37
Merge pull request #11069 from Ghommie/Ghommie-cit575
...
Fixing some privates overlays
2020-02-15 11:46:18 -07:00
Microvolnovka19
3f9965a781
Some sprite fixes ( #11089 )
...
* Delete penis_onmob.dmi
* Some sprite fixes
* Delete penis_onmob.dmi
* This should be ok
* Delete penis_onmob.dmi
* This should be ok?
* Delete penis_onmob.dmi
* This totally should be ok
2020-02-15 11:30:00 +01:00
Ghom
ad639d5f2f
Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7
...
!tgs valentine
2020-02-15 09:04:29 +01:00
Ghommie
4a621fb1aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
2020-02-14 19:39:53 +01:00
Ghom
2654843862
Merge pull request #11063 from Zellular/Animations1
...
Minor Pupdozer fix
2020-02-14 19:20:58 +01:00
kevinz000
0861179a79
Update chat_commands.dm
2020-02-13 20:34:48 -07:00
kevinz000
b3a81d9c8e
ok
2020-02-13 15:59:58 -07:00
Ghommie
a0dc21b01c
ok.
2020-02-13 12:50:08 +01:00
Ghommie
b8cebf8953
Fixing some privates overlays
2020-02-13 12:41:36 +01:00
Zellular
3bab6d70f7
Update widerobot.dmi
2020-02-13 00:43:09 -08:00
Ghom
9d55e2d514
Merge pull request #11030 from InnocentFire/markings_notmammals.dmi-update
...
Update to markings_notmammals.dmi
2020-02-13 09:27:55 +01:00
Ghom
1fd8ebc2dc
Update genitals.dm
2020-02-13 08:28:52 +01:00
Ghom
e4a20a16a4
Update genitals.dm
2020-02-13 08:25:44 +01:00
Ghom
1ef3f45f89
Update genitals.dm
2020-02-13 08:22:08 +01:00
Ghom
d9885cf278
oh damn, forgot those are numbers
2020-02-13 08:16:37 +01:00
Ghom
ee10c03630
Merge branch 'master' into Ghommie-cit562
2020-02-13 08:00:53 +01:00
kevinz000
4e419eed03
Merge pull request #10987 from Ghommie/Ghommie-cit567
...
Something about missing privates sprites and bad code.
2020-02-12 23:56:53 -07:00
Ghom
31c7a0e2be
Merge pull request #11020 from Zellular/Animations1
...
Movement animations for the pupdozer
2020-02-12 12:47:32 +01:00
InnocentFire
d1dc2edde3
Update to markings_notmammals.dmi
...
Changes Plain_r_arm, Plain_l_arm, Plain_r_hand and Plain_l_hand to remove the dark spots, since apparently this has the same dark markings as the last one.
2020-02-12 02:54:23 -05:00
InnocentFire
6739b0946d
Update markings_notmammals.dmi
...
Changes:
none_r_arm, none_l_arm, none_r_hand, and none_l_hand in the "Markings_notmammals.dmi to make them not have random dark markings on the body.
2020-02-11 19:16:09 -05:00
Zellular
64ab4353fb
Revert "Revert "Pupdozer animations""
...
This reverts commit a642bf9705
2020-02-11 08:34:11 -08:00
Zellular
a642bf9705
Revert "Pupdozer animations"
...
This reverts commit 8fbcdde9e8
2020-02-11 04:29:45 -08:00
Zellular
8fbcdde9e8
Pupdozer animations
...
Adds movement states for the pupdozer dogborg module.
2020-02-11 03:49:56 -08:00
Ghom
c2baad44d8
Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit
...
ENDS THE PLUSHIE DRAMA
2020-02-09 21:47:30 +01:00
Ghommie
c68c96373c
Ok.
2020-02-09 07:07:47 +01:00
Ghommie
f6adce72fb
Something about missing private sprites and their bad code.
2020-02-09 06:51:57 +01:00
Ghom
71f44a7085
Merge pull request #10892 from kevinz000/small_guncode_refactor
...
Small guncode refactor but it works
2020-02-07 23:13:21 +01:00
kevinz000
8107140aaf
Merge pull request #10924 from Citadel-Station-13/Ghommie-patch-8
...
Fixing whitelisted/donor loadouts
2020-02-06 23:56:32 -07:00
kevinz000
3f5805a9e8
Merge pull request #10798 from necromanceranne/secmainsrejoice
...
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
Ghom
f38e694673
Does it work? Yes. Does it compile? No.
2020-02-07 03:42:08 +01:00
Ghommie
2d8f85d810
A few nuisances solved.
2020-02-07 02:59:59 +01:00
Ghom
2370de52f9
Update genitals.dm
2020-02-07 02:46:15 +01:00
Ghommie
7f431af99d
Ok
2020-02-07 01:33:47 +01:00
Ghommie
00042292cf
Byond is pretty special.
2020-02-07 01:14:19 +01:00
Ghommie
39d6980bab
genitals code is so bad.
2020-02-07 01:03:59 +01:00
Ghommie
28df05bbb0
step 1
2020-02-07 00:24:54 +01:00
Ghommie
0703c6eea6
First tweak to cargo reagents selling.
2020-02-06 22:34:54 +01:00
kevinz000
cda01e10f6
Merge pull request #10885 from Ghommie/Ghommie-cit553
...
Removing a couple troublesome NSFW useless and unused preferences.
2020-02-05 23:45:30 -07:00
kevinz000
d0cd33a5ea
Merge pull request #10899 from Trilbyspaceclone/vender-hate
...
Almost all venders now can be restocked
2020-02-05 23:44:30 -07:00
Ghom
3a1a40ebd2
Update read_from_file.dm
2020-02-05 23:41:52 +01:00
Ghom
4b1e3d216f
Merge pull request #10583 from Putnam3145/arousal-tweaks
...
Consent logging
2020-02-05 07:19:37 +01:00
Ghom
aaa45f102e
Merge pull request #10875 from ancientpower/m-bunny-ears
...
Adds bunny ear style for humans and anthromorphs
2020-02-05 06:50:10 +01:00
TrilbySpaceClone
06fd6645b3
And it wokrs
2020-02-04 16:01:22 -05:00
kevinz000
8556a6188f
Merge remote-tracking branch 'citadel/master' into small_guncode_refactor
2020-02-04 03:47:01 -07:00
kevinz000
275b1f73e0
Merge pull request #10849 from Ghommie/Ghommie-cit547
...
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
kevinz000
66fc2e77f0
Merge pull request #10865 from Ghommie/Ghommie-cit550
...
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
2020-02-04 03:35:33 -07:00
