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
kevinz000
ab565d2483
Merge pull request #8547 from Ghommie/Ghommie-cit29
...
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
kevinz000
487461fbda
Merge pull request #8500 from Trilbyspaceclone/patch-158
...
Buffs stun slugs
2019-06-08 01:09:00 -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
Ghommie
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02: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
kevinz000
6ed955ddde
Update beams.dm
2019-05-27 14:25:45 -07: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
deathride58
2d01ac3604
Merge pull request #7868 from Citadel-Station-13/kevinz000-patch-4
...
fixes neurotoxin properly
2019-01-03 07:47:34 -05: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
kevinz000
5c3eb5b00e
Update neurotoxin.dm
2018-12-30 22:22:45 -08:00
kevinz000
96b4171044
Update neurotoxin.dm
2018-12-24 01:52:08 -08:00
kevinz000
6ba2d56435
Update neurotoxin.dm
2018-12-08 04:14:36 -08:00
nik707
dbe0d00cc0
Merge pull request #7728 from deathride58/drowsyebows
...
Buffs ebows by making them deal 50 drowsiness
2018-11-19 18:05:40 -06: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
deathride58
7801829908
Makes ebows induce drowsiness
2018-11-16 07:05:46 -05:00
Poojawa
cb342866d6
a few last minute changes from TG
...
also changes His Grace from 25 to 10 requirments
2018-09-18 23:12:29 -05:00
Poojawa
99e57fb221
various citadel tweaks/fixes
...
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -05: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
kevinz000
0e0928df26
Merge branch 'master' into fusion_2
2018-09-03 11:17:45 -07:00
deathride58
c8a3f56af6
Merge pull request #7489 from Citadel-Station-13/nanites
...
Nanites port
2018-09-03 13:47:28 -04:00
kevinz000
2bf5e6af58
Initial Commit
2018-09-03 10:35:47 -07:00
deathride58
69e1cb5aea
nerfs disablers, buffs tasers ( #7507 )
2018-08-28 02:41:01 -07:00
kevinz000
b99556c70f
Nanites port from /tg/station, original coder XDTM
2018-08-23 01:16:32 -07:00
kevinz000
5ccda57266
Update wormhole.dm
2018-07-24 01:06:37 -07:00
kevinz000
e29016b257
Update wormhole.dm
2018-07-21 02:17:54 -07:00
kevinz000
6e03770b93
Wormhole Update
2018-07-21 01:07:21 -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
vuonojenmustaturska
f36ab6982b
Fixes pulse rifles exploding structures in nullspace and that sort of thing ( #38931 )
...
* memes
* i just woke up ok
2018-07-06 11:40:54 -05:00
deathride58
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
oranges
de68aa9571
Individual Logs now follow the client around automatically ( #37790 )
...
The logging is now stored in the persistent client/player_details datum,
that will survive an entire round
The existing mob log is retained and a new admin verb is added to access
it. It will only show logs for the mob in question, across all players
who possibly spent time in that mob
A new log type is added that tracks the mobs the player changes across
into and the times they occured, to better help admins manage complex
situations, this also appears in the mob log as a record of the players
who entered/exited control of the mob
2018-06-06 04:10:20 -05:00
deathride58
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Dax Dupont
74932ddce0
Gun overlays 2: Electric boogaloo. ( #38003 )
...
* Reduces selfcharge gun processing/icon work
* More efficient gun overlays, adds old_ratio var
* oh my god it was calling the egun's update_icon?
* percent proc
* Attachment overlay overhaul
* Cut overlays in egun update
* ebow 1000% better overlay management
* Update gun.dm
* Pointless check
* Giving KA and children consistent icon behavior
* Update kinetic_accelerator.dm
* Fixed
* ..() readded
* ..() readded
* ..() readded
* Antur didnt catch this one heck
* Because confusing vars are apparently more maintainable
* Gun overlays 2: Electric boogaloo
* another one
* Chameleon guns are removed
* tentacles everywhere
2018-05-27 11:41:14 -05:00
LetterJay
6a575f19d1
Merge branch 'master' into upstream-merge-37597
2018-05-22 07:21:53 -05:00
Dax Dupont
0dcd8fb37a
Fixes oversight with foam ( #37898 )
...
braaap
TRUE FALSE
false false
2018-05-18 08:29:48 -05:00
LetterJay
8efc7711a7
Merge branch 'master' into upstream-merge-37423
2018-05-16 12:17:57 -05:00
Jordan Brown
7dc1c116d5
Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
...
Fix some missing icons
2018-05-14 15:13:33 -05:00
XDTM
ec3516ea19
[s] Hallucinations 4.0
2018-05-09 16:15:58 -05:00
