Commit Graph

33470 Commits

Author SHA1 Message Date
kevinz000 4e8a8dbebd Update items.dm 2020-04-27 02:55:11 -07:00
Lin c610ee86c1 Merge pull request #11986 from Owai-Seek/sprite-tweaks-4-22-20
Adjusts Sandwich Sprites
2020-04-27 04:17:08 +00:00
Ghom 858c697acc Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
Xenomorph balancing pass
2020-04-26 14:03:15 +02:00
Ghom b1befc2ba4 Merge pull request #11989 from Citadel-Station-13/kevinz000-patch-2
Nerfs confusion
2020-04-26 13:50:46 +02:00
Ghom 0cb32c901e Merge pull request #12013 from kappa-sama/patch-23
lowers plasmafist to standard spell costs
2020-04-26 13:45:28 +02:00
Ghom 2f7b02a663 Merge pull request #12029 from Putnam3145/fix-nukies
Adds uplinks back to nukies.
2020-04-26 13:22:50 +02:00
Putnam 257de9d4c9 Adds uplinks back to nukies. 2020-04-25 19:22:55 -07:00
kevinz000 8fc661ba14 Update pins.dm 2020-04-25 17:34:00 -07:00
Lin 3c52e321e2 Merge pull request #12027 from Citadel-Station-13/kevinz000-patch-4
fixes master
2020-04-26 00:24:09 +00:00
kevinz000 5e750bd43d Update pins.dm 2020-04-25 17:21:33 -07:00
kevinz000 565bfdb7b0 Merge pull request #11959 from Trilbyspaceclone/patch-351
Nerfs spiders defence stat against flyswatters - Alt  Australian crew buff.
2020-04-25 17:10:33 -07:00
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 6ff9d54e4f Merge pull request #11947 from MrJWhit/vg-atmos-box
Ports /vg/ atmos map for boxstation
2020-04-25 17:01:34 -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
Ghom 24971060bd Merge pull request #12016 from Citadel-Station-13/kevinz000-patch-1
fixes global proccall
2020-04-25 15:52:06 +02: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
Lin f745c59fad Merge pull request #11968 from MrJWhit/TEG-heat-go-away
teg map hot no hot room plz
2020-04-25 03:28:00 +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
kappa-sama 1f5c66651a costs 2020-04-24 21:02:58 -04: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 2ff75d8c99 commenting lines. 2020-04-24 23:20:05 +02:00
Ghommie a9be1e06e2 Fixing stuff, it now should be ready. 2020-04-24 23:00:31 +02:00
Ghom a831b3b623 Merge pull request #11995 from MrJWhit/fixes-to-pubby-engine
Quick fixing up of pubbystation things
2020-04-24 21:29:32 +02:00
Ghom 8ee2ae4877 Merge pull request #11994 from MrJWhit/fix-to-delta-because-it-was-annoying-me
Adds a missing wire and a second SMES to the AI sat on Deltastation
2020-04-24 21:27:40 +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