kevinz000
|
80606f42ac
|
Merge pull request #10334 from keronshb/REFLECTORBLOBPORT
Ports reflector blobs
|
2019-12-30 00:11:50 -08:00 |
|
kevinz000
|
d1434c767c
|
Merge pull request #10335 from kappa-sama/patch-12
mouth slice
|
2019-12-30 00:11:38 -08:00 |
|
kevinz000
|
0dc55b209a
|
Merge pull request #10336 from ItzGabby/Poly-Collar-UI-Fix
Fixes UI for poly collars
|
2019-12-30 00:11:27 -08:00 |
|
kevinz000
|
74edd7b13f
|
Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
|
2019-12-30 00:09:18 -08:00 |
|
kevinz000
|
3f4594d78e
|
Merge pull request #10312 from Commandersand/prayfornoconflictslel
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
|
2019-12-30 00:07:32 -08:00 |
|
kevinz000
|
47c92e380c
|
Merge branch 'master' into throwing_disarm_stuff
|
2019-12-30 00:05:17 -08:00 |
|
kevinz000
|
310d343242
|
Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
|
2019-12-30 00:03:21 -08:00 |
|
Putnam
|
1b7e9c6716
|
wow divide by 0 very cool
|
2019-12-29 22:03:23 -08:00 |
|
Putnam
|
ad83211058
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
|
2019-12-29 21:28:49 -08:00 |
|
Putnam
|
a4c356ad57
|
added a cryo to the ghost cafe
|
2019-12-29 21:28:09 -08:00 |
|
Putnam
|
cc087b990c
|
Code improvements
|
2019-12-29 21:01:55 -08:00 |
|
Putnam3145
|
640419eed5
|
Merge pull request #10343 from Ghommie/Ghommie-cit494
[s] Fixes anti-ghost-role vars a little.
|
2019-12-29 20:54:55 -08:00 |
|
Seris02
|
40730b48d5
|
few fixes
|
2019-12-30 11:49:16 +08:00 |
|
Seris02
|
f1292c503c
|
makes it a trait
|
2019-12-30 11:33:15 +08:00 |
|
Seris02
|
f663c4db96
|
tiny fixes
|
2019-12-30 11:24:12 +08:00 |
|
Putnam
|
ddf233e0d5
|
Made no antags show up after auto call
|
2019-12-29 18:53:49 -08:00 |
|
Putnam
|
93207cae0b
|
made "random" more random
|
2019-12-29 18:53:27 -08:00 |
|
Putnam
|
fb9b6dcc10
|
SCORING WRONG THE WHOLE TIME
|
2019-12-29 18:25:11 -08:00 |
|
Putnam
|
fa35c5128c
|
Rebalancing bloodsuckers a tad
|
2019-12-29 18:09:23 -08:00 |
|
Trilbyspaceclone
|
4a5715e5ac
|
Update belt.dm
|
2019-12-29 19:13:32 -05:00 |
|
Ghommie
|
87cca7a649
|
...which var are you?
|
2019-12-30 01:05:54 +01:00 |
|
Ghommie
|
8a32b89f17
|
Wait a minute...
|
2019-12-30 01:05:21 +01:00 |
|
Ghommie
|
55cb844bc2
|
chestbursters deleting brains fix.
|
2019-12-30 01:00:36 +01:00 |
|
Ghommie
|
edd05cebea
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-30 00:28:36 +01:00 |
|
BlackMajor
|
c14a639f6e
|
crusher wasn't dealing damage whoops
|
2019-12-30 12:25:12 +13:00 |
|
Ghommie
|
0ab817c208
|
[s] Fixes ghost anti-ghostrole timers a little.
|
2019-12-29 22:22:20 +01:00 |
|
keronshb
|
baf8b28f3a
|
Fixes Reduced Diagnostics and adds disks
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
|
2019-12-29 16:03:38 -05:00 |
|
Trilbyspaceclone
|
1cc4464726
|
Update engine_goggles.dm
|
2019-12-29 15:01:02 -05:00 |
|
Trilbyspaceclone
|
ee7346f280
|
got it
|
2019-12-29 15:00:33 -05:00 |
|
Trilbyspaceclone
|
a2b79e043f
|
Update code/modules/hydroponics/grown/grass_carpet.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-29 14:57:22 -05:00 |
|
Putnam
|
eb9e27a497
|
actually screw this "remove if recent" thing it's too much trouble
|
2019-12-29 11:23:37 -08:00 |
|
Putnam
|
68c9a371d9
|
Made story *purely* story, no extended-weighting
|
2019-12-29 10:56:48 -08:00 |
|
Ghom
|
d1a4bf6895
|
Merge pull request #10323 from Seris02/pandorafix
probably fixes pandoras attacking their owners
|
2019-12-29 17:30:59 +01:00 |
|
Ghom
|
b549670e39
|
Merge pull request #10324 from Trilbyspaceclone/patch-253
Honey no longer murders slimes
|
2019-12-29 17:24:19 +01:00 |
|
Seris02
|
b96bcf6eec
|
tiny fix
|
2019-12-29 23:47:30 +08:00 |
|
Seris02
|
9b3654e4ff
|
telescopic IVs
|
2019-12-29 23:26:53 +08:00 |
|
Seris02
|
a39c0249c4
|
marshmallow
|
2019-12-29 21:55:25 +08:00 |
|
BlackMajor
|
62b3c1e65b
|
Makes pick up range work
|
2019-12-30 02:28:23 +13:00 |
|
BlackMajor
|
8948e0491e
|
add mining card
|
2019-12-30 02:07:49 +13:00 |
|
BlackMajor
|
b811d3e57e
|
More work on it
|
2019-12-30 01:23:41 +13:00 |
|
Seris02
|
f6caff8227
|
hnnnnnng code improvements
|
2019-12-29 20:10:15 +08:00 |
|
Seris02
|
e093b5e5cd
|
roundend too
|
2019-12-29 18:51:10 +08:00 |
|
Seris02
|
3d3407363c
|
auto ooc
|
2019-12-29 18:48:00 +08:00 |
|
ItzGabby
|
9b5204bd46
|
Fixes UI for poly collars
AltClick for collars was seemingly forgotten so I've added it back
|
2019-12-29 05:15:25 -05:00 |
|
BlackMajor
|
375e59a77d
|
Merge branch 'master' into Yeehaw
|
2019-12-29 22:12:40 +13:00 |
|
BlackMajor
|
2e03a529bf
|
checking off the list
|
2019-12-29 22:11:10 +13:00 |
|
BlackMajor
|
206a5e168a
|
More mining changes
|
2019-12-29 20:15:49 +13:00 |
|
kappa-sama
|
3fad4edae0
|
mouth
|
2019-12-28 23:57:07 -05:00 |
|
Putnam
|
0ac0558417
|
balancing is good
|
2019-12-28 20:16:14 -08:00 |
|
keronshb
|
ab8a9227b4
|
Ports reflector blobs
Ports reflectors from /TG/
|
2019-12-28 23:02:05 -05:00 |
|