kevinz000
a380e71872
a
2020-05-09 00:16:29 -07:00
kevinz000
407b1c7447
Merge remote-tracking branch 'citadel/master' into projectiles_2
2020-05-08 23:32:01 -07:00
kevinz000
19072abe37
compile
2020-05-08 23:01:05 -07:00
kevinz000
6d6239a8b4
kay
2020-05-08 22:59:51 -07:00
kevinz000
e684c6e574
ok
2020-05-08 22:40:07 -07:00
kevinz000
4cd5e08902
sigh
2020-05-08 21:27:36 -07:00
Hatterhat
6067370a6f
shotgun shell clips ( #11955 )
...
* shell clips revised by based ghom
* lmao yeet better not forget that bit
* nitpicking but also merge 11976 first
* No freeloaders.
* Update weapon_designs.dm
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-09 02:49:25 +02:00
kevinz000
3a8e9da73b
Fixes projectiles going sanic ( #12167 )
...
* ok
* woops
2020-05-09 01:27:26 +02:00
kevinz000
1872f556ac
woops
2020-05-08 15:09:02 -07:00
kevinz000
afa006d280
ok
2020-05-08 15:02:38 -07:00
Ghommie
2858ddd90b
Porting "Refactors language holder"
2020-05-08 22:44:02 +02:00
Ghommie
60bdbfaf61
Merge conflicts, procs instead of macros, mood signals.
2020-05-08 02:12:41 +02:00
Detective-Google
bd37d45334
Ports TG Icemoon framework and map ( #49680 ) ( #12002 )
...
* ports all the tg junk for icemoon, not yet changed to make it all compile
* fixes
* fixes
* fixes
* fixes
* fixes
* new stuff
* whew
* fixes
* it compiles, now to fix the maps
* fixes the maps
* fixes solars + removes the space tiles in the toxins burn chamber
* nukes the SpawnTerrain proc used for tg geysers
* linter fix
* fix
* fixes the non matching turf atmos (hopefully)
* more mapping fixes
* dmm2tgm
* unfucks changeturf for the more_caves
* fixes the volanic subtypes of the other thing
* fixes the stupid fucking tile placing list
* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life
* fixes a bunch of mismatch atmos in ruins
* fixes wendigo cave having no air
* backwards couch backwards couch
* fixes the SM up
* wendigos can't runtime when butchering if you can't butcher them 😎
* makes the wendigo fight have the same atmos as the surrounding icemoon
* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work
* makes the wendigo screech shake not completely aids
* fixes snowlegion portals dropping proper legions instead of skeles
* brings the engioutpost ruin over as well
* whoopps
* empty commit to reroll bots
* Fixes pirates, ops, the mining base, and gives pirates and ops drills
* fixes lone ops and ninjas
* fixes the snowed plating getting fucked when tiles are placed on it
* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)
* more bug fixes
* empty commit to reroll bots
* hopefully finally kills the active turfs on the library ruin
Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com >
2020-05-07 14:46:16 +02:00
kevinz000
56fe430a25
ok ( #12119 )
2020-05-05 23:18:09 +02:00
Ghommie
643ef48f0e
Macros, generic skill implementations.
2020-05-05 04:42:34 +02:00
ZeroMan
438a83b5c0
a
2020-04-30 17:56:07 -04:00
Lin
7784f5efa1
Merge pull request #12034 from Citadel-Station-13/kevinz000-patch-7
...
Maybe fixes vehicles blocking projectiles
2020-04-30 17:41:07 +00:00
kevinz000
3d116f5e7e
Merge pull request #12000 from zeroisthebiggay/comprehensivefucksecuritypr
...
Fuck Ranged Security Knockdowns: The Taser Nerf PR That Will Get Me Killed By A Witchhunt
2020-04-29 12:01:33 -07:00
Ghom
858c697acc
Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
...
Xenomorph balancing pass
2020-04-26 14:03:15 +02:00
kevinz000
0e8c2ca109
Update projectile.dm
2020-04-25 21:04:22 -07:00
kevinz000
8fc661ba14
Update pins.dm
2020-04-25 17:34:00 -07:00
kevinz000
5e750bd43d
Update pins.dm
2020-04-25 17:21: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
d041df458c
Merge pull request #11998 from Ghommie/Ghommie-cit706
...
Still unimplemented security level firing pins.
2020-04-25 16:53:39 -07:00
ZeroMan
087f5d731a
these too i guess
2020-04-25 08:21:34 -04: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
ZeroMan
883b932a48
i will eliminate security
2020-04-23 22:28:50 -04:00
Ghommie
b914f6f96d
Still unimplemented security level firing pins.
2020-04-24 03:20:51 +02: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
Hatterhat
57eedfbe63
fastpumpers no longer lose stam from pumping
2020-04-22 18:33:16 -05:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
Hatterhat
c686ed193b
a book about mashing Z and LMB
2020-04-22 17:55:11 -05:00
Hatterhat
2126ca1674
dot on casing name gone
2020-04-22 15:41:22 -05:00
kevinz000
1bcca265ac
buff neurotox
2020-04-22 08:35:08 -07:00
kevinz000
d259519bff
changes
2020-04-22 08:31:09 -07:00
kevinz000
0eac988f52
okay!
2020-04-22 08:22:52 -07:00
Ghom
0c15c09e48
Update _box_magazine.dm
2020-04-22 16:30:30 +02:00
Artur
f910a0fd32
Conflict fixes
2020-04-14 09:27:54 +03:00
kevinz000
6b6683846b
Merge pull request #11819 from Ghommie/Ghommie-cit672
...
Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07:00
Ghommie
31e0321808
Minor action datum refactor and spellcasting fix.
2020-04-11 16:53:08 +02:00
spookydonut
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
Akrilla
87dce0c3e9
dont need to null when qdeling later
2020-04-09 18:41:39 +01: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
Lin
8379169b81
Merge pull request #11476 from kevinz000/shield_refactor
...
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
TrilbySpaceClone
2cd59a6fb0
that was easy
2020-04-06 08:40:34 -04:00
kevinz000
12d78dd7d8
Merge pull request #11329 from Ghommie/Ghommie-cit601
...
Made laser carbines and magrifles bulkier.
2020-04-03 16:30:47 -07:00
Artur
a903752ff9
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-31 19:42:35 +03:00
necromanceranne
a4313ee101
Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink ( #11675 )
2020-03-29 17:45:01 +02:00
necromanceranne
cd9a782d9f
Double-barreled shotgun and their children now can be used with off-hand weapons ( #11674 )
2020-03-29 17:20:39 +02:00
necromanceranne
02a8104c3b
Makes taserslugs actually tasers, makes mech scattershot not a oneshot ( #11671 )
2020-03-29 17:19:27 +02:00
