kevinz000
af08e0fecf
Merge pull request #11984 from Hatterhat/fastpump
...
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
2020-04-25 17:07:29 -07:00
kevinz000
24bac60a95
Merge pull request #12012 from Ghommie/Ghommie-cit710
...
Fixing non-skirt dresses being invisible on digitigrades.
2020-04-25 17:05:49 -07:00
kevinz000
d7f38faab9
Merge pull request #11971 from Putnam3145/fix-story-storyteller
...
More dynamic tweaks
2020-04-25 17:05:38 -07:00
kevinz000
f6a5f92ff3
Merge pull request #11918 from Ghommie/Ghommie-cit689
...
nerf to biogenerator upgrades, removal of flour and glass bottles designs.
2020-04-25 16:59:38 -07:00
kevinz000
d9b6ea5181
Merge pull request #11847 from Ghommie/Ghommie-cit679
...
A peeve with random bodies.
2020-04-25 16:59:07 -07:00
kevinz000
0dc259a985
Merge pull request #11990 from Trilbyspaceclone/patch-357
...
Test merge maybe - Buffs space vines
2020-04-25 16:54:47 -07:00
kevinz000
36512938a0
Merge pull request #11991 from DeltaFire15/nanite-repli-protocols
...
Adds nanite replication protocols to our techweb
2020-04-25 16:54:32 -07:00
kevinz000
a533906f73
Merge pull request #11992 from Ghommie/Ghommie-cit703
...
reagents value nerf and standardization.
2020-04-25 16:54:14 -07:00
kevinz000
da61b04ed0
Merge pull request #11997 from Ghommie/Ghommie-cit705
...
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
kevinz000
d041df458c
Merge pull request #11998 from Ghommie/Ghommie-cit706
...
Still unimplemented security level firing pins.
2020-04-25 16:53:39 -07:00
kevinz000
7d688126c8
Merge pull request #12008 from Ghommie/Ghommie-cit707
...
VR Levels are not a subset of Away Missions anymore.
2020-04-25 16:51:52 -07:00
kevinz000
fb1c4c215f
Merge pull request #12009 from Ghommie/Ghommie-cit708
...
Fixing empty new lines on IC assemblies examine.
2020-04-25 16:51:36 -07:00
kevinz000
0bf1f1e34f
Merge pull request #12010 from Ghommie/Ghommie-cit709
...
Porting some VV updates from tg.
2020-04-25 16:51:27 -07:00
kevinz000
4689e2aeb6
Merge pull request #11980 from Ghommie/Ghommie-cit700
...
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Lin
4d596ddff6
Merge pull request #12007 from Citadel-Station-13/Ghommie-patch-1
...
Fixing robo limb burn damage being unfixable.
2020-04-25 18:37:35 +00:00
Lin
499e71c528
Merge pull request #11993 from Ghommie/Ghommie-cit704
...
porting CEV-Eris pickweight procs.
2020-04-25 18:30:26 +00:00
kevinz000
cbe2daea94
Update callproc.dm
2020-04-24 23:52:49 -07:00
Lin
25c9653540
Merge pull request #11966 from NopemanMcHalt/digi-justice
...
Fixes cosmetic tactifool sprite not using digitigrade sprites
2020-04-25 03:31:04 +00:00
Ghom
283440e8eb
Merge pull request #11848 from Putnam3145/experimental-major-optimization
...
Removing SS_TICKER from the lighting subsystem
2020-04-25 03:08:27 +02:00
Ghom
21619b1ee3
Merge pull request #11925 from Trilbyspaceclone/patch-347
...
The Pr that nerfs crayon eating
2020-04-25 02:54:40 +02:00
Ghom
7b877eb9e0
Merge pull request #11832 from Seris02/storagewhitelist
...
adds extra functionality to storage whitelists
2020-04-25 02:50:56 +02:00
Ghom
5ccdc55e42
Merge pull request #11979 from kevinz000/magnetic_harness
...
Cybernetic arm implant balance pass (namely: shields)
2020-04-25 02:47:28 +02:00
Ghom
f01cb896e5
Apply suggestions from code review
2020-04-25 02:43:56 +02:00
Ghom
c8c5073c35
Merge pull request #11981 from Hatterhat/10mm-doesnt-have-a-dot-in-front-idiot
...
10mm doesnt have a dot in the caliber name bro
2020-04-25 02:31:28 +02:00
Ghommie
0f654d9f0e
Fixing dresses being invisible on digitigrades.
2020-04-25 02:23:13 +02:00
Putnam
17f6099013
new clamp
2020-04-24 16:18:34 -07:00
Putnam
95d1a25df7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller
2020-04-24 16:07:38 -07:00
Ghommie
e17c51a85d
Porting some VV updates from tg.
2020-04-25 00:49:51 +02:00
Ghommie
ca2d4ae28f
Fixing empty new lines on circuit examines.
2020-04-24 23:44:07 +02:00
Ghommie
a9be1e06e2
Fixing stuff, it now should be ready.
2020-04-24 23:00:31 +02:00
Ghommie
58fc679cce
WIP
2020-04-24 20:49:15 +02:00
Ghom
89e5681593
Fixing robo limb burn damage being unfixable.
2020-04-24 18:33:54 +02:00
Ghommie
a97c2f66a5
Putnam's suggestions.
2020-04-24 03:44:12 +02:00
Ghommie
b914f6f96d
Still unimplemented security level firing pins.
2020-04-24 03:20:51 +02:00
Ghommie
a62f3f0d92
Clarifies a comment.
2020-04-24 01:12:33 +02:00
Ghommie
d1ec18a0ce
what the?!
2020-04-24 00:57:40 +02:00
Ghommie
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
Trilbyspaceclone
83ba5c1b9b
Update venus_human_trap.dm
2020-04-23 16:52:24 -04:00
Ghommie
de531bd047
porting CEV-Eris pickweight procs.
2020-04-23 21:47:54 +02:00
kevinz000
cf61795101
Merge pull request #11941 from kiwedespars/punch-bundle
...
re-adds north star gloves to traitors for 20 tc
2020-04-23 11:45:04 -07:00
kevinz000
6a5e286ed2
Merge pull request #11942 from Trilbyspaceclone/cube-world
...
Cube world, aka - More dehydrated cubes! Modular Cubes and more!
2020-04-23 11:44:48 -07:00
kevinz000
45319b4942
Merge pull request #11976 from Citadel-Station-13/Ghommie-patch-1
...
Updates ammo_box/update_icon() to nowadays standards.
2020-04-23 11:41:51 -07:00
Ghommie
0beb28d3bb
reagents value nerf and standardization.
2020-04-23 19:52:22 +02:00
DeltaFire
1a6f5eb131
If it compiles it works
...
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
2020-04-23 15:15:26 +02:00
Ghommie
b5abfd9273
thank you dreamchecker.
2020-04-23 14:49:05 +02:00
Ghom
e4c6df71fc
Update tacklers.dm
2020-04-23 14:35:36 +02:00
TrilbySpaceClone
7761990919
soooo this complies but does it work?
2020-04-23 03:13:07 -04:00
TrilbySpaceClone
86abfefa1b
still dosnt work
2020-04-23 02:52:07 -04:00
Trilbyspaceclone
f1a5ba0754
wew
2020-04-23 02:28:16 -04:00
Trilbyspaceclone
b0e8c90531
Update spacevine.dm
2020-04-23 02:19:04 -04:00
