kevinz000
|
bcf77458dd
|
nicer way to bash people
|
2020-04-11 08:37:02 -07:00 |
|
kevinz000
|
eacc783f09
|
k
|
2020-04-11 08:23:25 -07:00 |
|
kevinz000
|
b39eb60c4a
|
shield bashing
|
2020-04-11 07:30:23 -07:00 |
|
kevinz000
|
f3537f38e6
|
shield bashing
|
2020-04-11 07:09:50 -07:00 |
|
Ghom
|
5869f72980
|
Merge pull request #11776 from zeroisthebiggay/supritoburritoemittercarbines
cool emitter carbine resprite
|
2020-04-11 02:03:14 +02:00 |
|
Ghom
|
cd2edb3cf1
|
dont need to null when qdeling later (#11797)
|
2020-04-11 01:59:46 +02:00 |
|
Akrilla
|
747be9cbe4
|
Better random plush spawning (#11792)
* better spawning
* check list size
* changes
|
2020-04-11 01:59:29 +02:00 |
|
Lin
|
48e64a8c6f
|
Merge pull request #11813 from Citadel-Station-13/Ghommie-patch-5
Fixing master.
|
2020-04-10 18:44:03 +00:00 |
|
Ghom
|
a75bd30911
|
Update carbon_defense.dm
|
2020-04-10 19:54:12 +02:00 |
|
Putnam3145
|
b939359e35
|
Made my choice thing actually... do something (#11787)
|
2020-04-10 18:16:19 +02:00 |
|
kevinz000
|
d5769a6ee4
|
Update carbon_defense.dm (#11738)
|
2020-04-10 18:13:50 +02:00 |
|
Arturlang
|
b40fb55539
|
Fixes mesmerzie and makes it work better (#11785)
* Weh
* Mesmerize works a lot nicer now
|
2020-04-10 15:41:35 +02:00 |
|
kevinz000
|
d19dd8f2e1
|
fixes baystruments (#11790)
* fix
* sigh
|
2020-04-10 15:36:42 +02:00 |
|
Akrilla
|
753be141be
|
show pref change (#11793)
|
2020-04-09 20:32:50 +02:00 |
|
Akrilla
|
87dce0c3e9
|
dont need to null when qdeling later
|
2020-04-09 18:41:39 +01:00 |
|
Putnam3145
|
a203ef7de5
|
Merge pull request #11794 from Citadel-Station-13/kevinz000-patch-1
DefaultCombatKnockdown now respects CANKNOCKDOWN status flag
|
2020-04-09 10:07:25 -07:00 |
|
Arturlang
|
f80900fd0b
|
Fixes vendors not eating coins (#11795)
|
2020-04-09 19:07:11 +02:00 |
|
kevinz000
|
0cd7437f49
|
Update status_procs.dm
|
2020-04-09 09:33:21 -07:00 |
|
Putnam3145
|
295a4e0238
|
ass-covering (#11788)
|
2020-04-09 16:19:57 +02:00 |
|
CitadelStationBot
|
c701a19864
|
Update github_webhook_processor.php
|
2020-04-09 09:13:25 -05:00 |
|
CitadelStationBot
|
b2ae6ae521
|
Update github_webhook_processor.php
|
2020-04-09 09:11:47 -05:00 |
|
kevinz000
|
bfad661c1c
|
Merge pull request #11737 from Trilbyspaceclone/patch-330
Buffs Stimpacks
|
2020-04-09 06:57:13 -07:00 |
|
Putnam3145
|
5078b5875a
|
Fixes my oldish badcode. (#11781)
|
2020-04-09 14:48:58 +02:00 |
|
kevinz000
|
7cb2057bb0
|
Merge pull request #11751 from Arturlang/kills_the_shitty_fix
TGUI Next vendors plus spritesheet port from TG
|
2020-04-09 03:53:08 -07:00 |
|
kevinz000
|
a08536b0ff
|
Merge pull request #11778 from kappa-sama/patch-17
shamelessly nerfs purified claymore
|
2020-04-09 02:41:40 -07:00 |
|
kevinz000
|
aee2f46b8d
|
Merge pull request #11777 from Ghommie/Ghommie-cit670
Makes RAD_PROTECT_CONTENTS radiation flag protect both ways.
|
2020-04-09 02:41:21 -07:00 |
|
kevinz000
|
f60cf32562
|
Merge pull request #11775 from Trilbyspaceclone/frail-crafting
Frail crafting - Glass work additions and changes!
|
2020-04-09 02:41:01 -07:00 |
|
kevinz000
|
ba4585951e
|
Merge pull request #11765 from Putnam3145/dynamic-chaos-weight
Makes intrigue, classic, story storytellers have their chaos weighted by recent round chaos
|
2020-04-09 02:40:25 -07:00 |
|
kevinz000
|
22bf4cdb83
|
Merge pull request #11760 from Trilbyspaceclone/10mmchanges
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
|
2020-04-09 02:38:44 -07:00 |
|
kevinz000
|
779766d1f6
|
Merge pull request #11759 from Trilbyspaceclone/telecoms
Makes upgrading telecoms more usefull
|
2020-04-09 02:38:10 -07:00 |
|
kevinz000
|
ffa7f198a0
|
Merge pull request #11752 from EmeraldSundisk/cogfix1
Some door fixes for CogStation.
|
2020-04-09 02:37:55 -07:00 |
|
kevinz000
|
b8548f521b
|
Merge pull request #11746 from Trilbyspaceclone/found_and_hidden
Atomic PR 1 or 2 - Toilet Mapping!
|
2020-04-09 02:11:43 -07:00 |
|
kevinz000
|
956a85ab34
|
Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
Punch Changes 2: The Quickening
|
2020-04-09 02:09:51 -07:00 |
|
kevinz000
|
9208c42747
|
Merge pull request #11722 from timothyteakettle/bye-separated-chems
goodbye separated chemicals
|
2020-04-09 02:02:55 -07:00 |
|
Putnam3145
|
474d6a486d
|
Merge pull request #11773 from Arturlang/cablefix
Fixes cablecuff making producing 0 amount cables
|
2020-04-09 01:28:30 -07:00 |
|
Artur
|
0a234d5618
|
TABS NOT SPACES
AAAAAAAA
|
2020-04-09 09:32:23 +03:00 |
|
Putnam3145
|
30157c6b69
|
Merge pull request #11782 from Citadel-Station-13/Linzolle-patch-1
blacklist ERP chems from mass production (i.e. bees.)
|
2020-04-08 12:33:25 -07:00 |
|
Lin
|
c2cbad81dd
|
what the fuck
|
2020-04-08 19:00:18 +00:00 |
|
Artur
|
75a2dd6900
|
Finnishing touches, hopefully
Tweaks some indendation
|
2020-04-08 18:32:45 +03:00 |
|
Artur
|
3cf6524389
|
Makes it nicer, removes check_cable_amount
Putnam suggested this as well
|
2020-04-08 18:28:35 +03:00 |
|
Arturlang
|
cdd2f55cac
|
Putnams suggestion
Makes use() a if, as to use it as a further sanity check
Co-Authored-By: Putnam3145 <putnam3145@gmail.com>
|
2020-04-08 18:24:14 +03:00 |
|
Artur
|
5fbe05f3c9
|
Cleaning up and finishing up
|
2020-04-08 18:16:10 +03:00 |
|
necromanceranne
|
2becb6d74f
|
not really relevant given I literally decided to axe the mod
|
2020-04-09 00:44:01 +10:00 |
|
necromanceranne
|
ad09cb6790
|
This needs to go, there is just no way to reasonably have this mod as of the moment while it is basically giving a universal stamina discount.
|
2020-04-09 00:07:54 +10:00 |
|
necromanceranne
|
f0a738ef21
|
I'm sneaking in a nerf to scarp here shush shush
|
2020-04-08 22:53:51 +10:00 |
|
kappa-sama
|
a60257b0e2
|
o7
|
2020-04-08 00:05:32 -04:00 |
|
Ghommie
|
fb22a04939
|
Makes RAD_PROTECT_CONTENTS protect both ways.
|
2020-04-08 06:00:21 +02:00 |
|
ZeroMan
|
f4ce4e07f7
|
i did the thing
|
2020-04-07 20:37:14 -04:00 |
|
Trilbyspaceclone
|
97dbd6ae7f
|
Update parts.dm
|
2020-04-07 18:38:53 -04:00 |
|
TrilbySpaceClone
|
b350436fbc
|
working
|
2020-04-07 18:31:23 -04:00 |
|