Ghommie
|
4a621fb1aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
|
2020-02-14 19:39:53 +01:00 |
|
Ghom
|
78ace8e855
|
Merge pull request #10916 from Citadel-Station-13/kevinz000-patch-6
Projectiles now always hit chest if targeting chest, snipers now have 100% targeting zone accuracy
|
2020-02-14 19:20:32 +01:00 |
|
Hatterhat
|
1d071ff127
|
one off
|
2020-02-10 21:40:51 -06:00 |
|
Hatterhat
|
d24afcde1b
|
pb burst from 60 to 81
|
2020-02-09 19:07:24 -06:00 |
|
Ghommie
|
0703c6eea6
|
First tweak to cargo reagents selling.
|
2020-02-06 22:34:54 +01:00 |
|
kevinz000
|
3d7fef76f3
|
Update sniper.dm
|
2020-02-05 05:57:16 -07:00 |
|
Ghommie
|
a365f3b499
|
Demodularize and nerfs mag rifles with re(?)added power cell requirements.
|
2020-02-03 05:16:32 +01:00 |
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
Ghommie
|
b4c0433d6d
|
more work.
|
2019-12-27 17:45:19 +01:00 |
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
kevinz000
|
dfa2296758
|
Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-11-14 15:44:59 -07:00 |
|
Ghommie
|
42d9e3cf51
|
Porting Robustin's Syndicate Infiltrator PR
|
2019-11-11 18:49:18 +01:00 |
|
Ghommie
|
b17346a44e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220
|
2019-10-30 14:46:42 +01:00 |
|
kevinz000
|
9d78d8a259
|
Merge branch 'master' into magrifles_again
|
2019-10-23 17:57:19 -07:00 |
|
kevinz000
|
c6c2a703e5
|
Merge remote-tracking branch 'origin/master' into magrifles_again
|
2019-10-21 00:47:03 -07:00 |
|
Ghommie
|
5232728ee7
|
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-10-07 05:25:47 +02:00 |
|
Poojawa
|
f57bdc39a2
|
I still fucking hate components.
|
2019-09-23 02:03:37 -05:00 |
|
Poojawa
|
53895106dc
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-13 12:58:02 -05:00 |
|
Tupinambis
|
3b2be43bd8
|
Slightly increased rubbershot damage from 12.5 to 15 per pellet.
|
2019-08-27 18:35:08 -05:00 |
|
Tupinambis
|
13638ed5d6
|
Reverts some changes I deemed unneccesary. Undoes a fuckup
|
2019-08-26 15:08:36 -05:00 |
|
Tupinambis
|
a4fd2be7f7
|
Various Shotgun Nerfs.
|
2019-08-26 14:45:12 -05:00 |
|
Poojawa
|
23333f6ea5
|
reverts the majority of clean act because it doesn't work properly otherwise
|
2019-08-20 23:03:31 -05:00 |
|
Poojawa
|
0290a46ddc
|
Impliments Ghom review, reverts blood list back to component
|
2019-08-15 12:32:44 -05:00 |
|
Poojawa
|
3499d73f6b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
|
2019-07-31 19:24:39 -05:00 |
|
kevinz000
|
69f06444e6
|
smgs
|
2019-07-09 08:20:45 -07:00 |
|
Thalpy
|
1cc0724519
|
Merge branch 'master' into Dwarf
|
2019-06-17 12:09:55 +01:00 |
|
Fermi
|
17403bd059
|
Non-functioning EMP code for review (revert before merging.)
|
2019-06-13 00:58:54 +01:00 |
|
kevinz000
|
2f2885f1d6
|
Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
|
2019-06-08 01:26:28 -07:00 |
|
Fermi
|
b6788cdd64
|
Updated projectile sprite.
|
2019-06-08 01:45:32 +01:00 |
|
Fermi
|
42d0ab4825
|
Comment cleanup.
|
2019-06-08 01:31:21 +01:00 |
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
Fermi
|
2888e1b30b
|
Dartgun functions as intended.
|
2019-06-07 00:12:11 +01:00 |
|
Fermi
|
1a42c017ac
|
DEBUG
|
2019-06-06 23:23:53 +01:00 |
|
Trilbyspaceclone
|
da67bdf63d
|
>_>
|
2019-06-04 12:40:29 -04:00 |
|
Fermi
|
fd22dbfc0d
|
More fixes. Need to check over merging math.
|
2019-06-02 03:59:52 +01:00 |
|
Fermi
|
0fa445c153
|
Fixes and test.
|
2019-06-02 03:24:01 +01:00 |
|
Trilbyspaceclone
|
ddfe9812a1
|
Update shotgun.dm
|
2019-05-31 16:06:26 -04:00 |
|
Poojawa
|
971ddef989
|
reverts forensics components. If I can't figure it out, MURDER IT
|
2019-05-22 04:10:29 -05:00 |
|
deathride58
|
09f77d0438
|
Nerfs dinks - Ballistic projectiles are now the only projectiles that can emit a dink
|
2019-03-18 23:02:07 -04:00 |
|
Trilbyspaceclone
|
21f111b5e0
|
[Ready] New mech weapon, Melon Seed Scatter shot! - Requested and helped made by Elllsiy (#7873)
* Fixing updater
* Adds the gunthingy
* makes the bullet
* Update mecha_designs.dm
* Update all_nodes.dm
* Fixes stam harm
|
2019-01-03 04:38:10 -08:00 |
|
deathride58
|
f385751c4a
|
Brings back nonlethal 38 bullets in a semi-nerfed state, keeps the current lethal variant in as a brand new sec autolathe printable ammo box (#7723)
* Brings back nonlethal 38 bullets in a semi-nerfed state, adds lethal variant for the c38 bullet available at autolathes
* Im drunk ignore me
|
2018-11-16 14:46:54 -08:00 |
|
Poojawa
|
284e9d0325
|
module things, jfc
|
2018-09-11 07:51:01 -05:00 |
|
deathride58
|
6fa011c1be
|
INTRODUCING KITCHEN GUN (#7508)
|
2018-09-07 05:40:35 -07:00 |
|
deathride58
|
914967f081
|
Merge pull request #7356 from Trilbyspaceclone/WT-550
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
|
2018-07-10 02:03:08 -04:00 |
|
TrilbySpaceClone
|
ffc5c6935a
|
Lets see If I did this correct this time!
|
2018-07-06 18:01:29 -04:00 |
|
TrilbySpaceClone
|
d764f5128a
|
Adds in the ammo and the bullet!
|
2018-07-06 15:49:19 -04:00 |
|
deathride58
|
b1688405d9
|
and finally, the modules folder. Now I can publish and take a break
|
2018-07-02 01:19:37 -04:00 |
|
iksyp
|
ba4f3c0698
|
Makes pacifists able to use .50BMG Soporific Rounds (#37506)
* non lethal .50BMG
* no more spaghetti sauce?
I havent actually tested this
|
2018-04-29 10:11:42 -05:00 |
|
vuonojenmustaturska
|
32fe9d4fd6
|
Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)
* couple of mech fixes
* safety
* gateway, gravity gen
* Restores oingo-boingo punch-nuke
|
2018-04-18 09:33:31 -05:00 |
|