necromanceranne and GitHub
26ec48f174
straight shooting guns ( #11602 )
2020-03-25 21:18:02 +01:00
kevinz000 and GitHub
4eaa3a22c2
fixes beam rifles and some micro optimizations to projectiles and readds the chameleon gun for debugging ( #11528 )
...
* wew
* ah
* k
* k
* faster
2020-03-21 02:45:34 +01:00
kevinz000 and GitHub
339ea13e00
Update beam_rifle.dm ( #11477 )
2020-03-15 20:54:23 +01:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
kevinz000
7c16830e91
ok
2020-02-07 23:31:38 -07:00
kevinz000 and GitHub
ae199cee28
Update beam_rifle.dm
2020-02-06 23:49:36 -07:00
kevinz000 and GitHub
353c13631a
Update beam_rifle.dm
2020-02-06 23:34:33 -07:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +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
Useroth and GitHub
c35acf00fe
Empty commit to make travis recompile.
2019-12-07 15:18:37 +01:00
Useroth and GitHub
28ddfd29b6
Merge branch 'master' into new-tg-plants
2019-12-07 14:25:38 +01:00
Useroth
1158c03ed7
Added bamboo.
2019-12-06 19:00:10 +01:00
Ghommie
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
kevinz000 and GitHub
da502aa31d
Merge pull request #9535 from Ghommie/Ghommie-cit247
...
Fixing sniper rifles scope datum action oddity.
2019-10-24 19:05:25 -07:00
Ghommie
fc1f10c97f
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
Ghommie
e991328087
progress
2019-10-19 15:02:56 +02:00
Thalpy
597160ca15
Fixed werid stuff.
2019-10-15 14:17:36 +01:00
Thalpy
e115c456f3
Ohh I'm fixing
2019-10-15 13:41:49 +01:00
Thalpy
acc0ff8a17
Adds craftable extended mags
2019-10-15 12:37:35 +01:00
kevinz000 and GitHub
f7dcedce5f
Merge pull request #8715 from Sishen1542/toxinmanbad
...
Pentetic Jelly, the chem we all needed. Anatomic panacea not deadly for slimes! Also, medbeam buff?
2019-06-23 06:57:09 -07:00
Sishen
0a43036eae
hugboxing slimepeople one thing at a time
2019-06-21 20:01:19 -04:00
Thalpy and GitHub
1cc0724519
Merge branch 'master' into Dwarf
2019-06-17 12:09:55 +01:00
Fermi
9fcbac0323
Lil flavour.
2019-06-08 01:23:57 +01:00
Fermi
65b218d4c3
Spritework.
2019-06-08 00:31:14 +01:00
Ghommie
7aac9e6280
Updates reagents a bit.
2019-06-07 06:27:04 +02:00
Fermi
0fa445c153
Fixes and test.
2019-06-02 03:24:01 +01:00
Fermi
3cf3268c76
New non-harmful medicinal darts.
2019-06-01 22:52:03 +01:00
kevinz000 and GitHub
79b4d5f663
Update beam_rifle.dm
2018-11-19 20:24:21 -08:00
kevinz000 and GitHub
5cde0d0401
Update beam_rifle.dm
2018-11-09 19:02:04 -08:00
Poojawa
720b25c6f5
floor fixes and gun memes
2018-09-22 03:50:37 -05:00
Poojawa
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
deathride58 and kevinz000
7650bac441
Upstream bugfix mirror spree ( #7541 )
...
* tgstation/tgstation#40061 - Fixes mobs getting stuck at min/max body temperature
* tgstation/tgstation#40043 - fixes beam rifles opening lockers
* tgstation/tgstation#40041 - Pictures of asses are properly sized now
* tgstation/tgstation#40084 - fixes lastattacker not including unarmed attacks
* tgstation/tgstation#39968 - Fixes plastic golems ventcrawling with items in pockets
* tgstation/tgstation#39885 - Fix overcharging energy guns crashing the server
2018-09-07 07:25:42 -07:00
LetterJay
1b11773cd9
DB port
2018-08-23 07:20:49 -05:00
kevinz000 and GitHub
b33d2b82fb
Merge branch 'master' into mirror-38933
2018-07-14 15:26:49 -07:00
kevinz000
bcb1b04c40
Upstream mirror
2018-07-14 15:24:35 -07:00
deathride58
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
kevinz000 and letterjay
561c2179f8
Fixes and adds blast cannons to traitor science uplink items ( #38093 )
...
rscadd: Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC.
rscadd: Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)
2018-06-21 18:38:46 -05:00
ShizCalev and letterjay
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
deathride58 and kevinz000
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
LetterJay
ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
Jordan Brown and letterjay
7dc1c116d5
Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
...
Fix some missing icons
2018-05-14 15:13:33 -05:00
deathride58 and GitHub
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
Tlaltecuhtli and CitadelStationBot
9533779be7
slighty upgrades the medbeam ( #37451 )
...
🆑
tweak: medbeams heal tox and oxy slighty
/🆑
why: because some dude having 1 tox damage and not being able to heal is really frustating
2018-05-03 19:14:32 -05:00
LetterJay and GitHub
fcb1261c13
Merge pull request #6586 from Citadel-Station-13/upstream-merge-37503
...
[MIRROR] Fixes Blast Cannon
2018-04-30 11:02:16 -05:00
Fox McCloud and CitadelStationBot
e2328a122e
Fixes Blast Cannon ( #37503 )
...
* Fixes Blast Cannon
* no magic numbers
* tweak
2018-04-30 04:53:32 -05:00
kevinz000 and CitadelStationBot
3ba3d5fb5e
beam rifle delay ( #37544 )
2018-04-30 04:53:21 -05:00
kevinz000 and Poojawa
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
as334 and CitadelStationBot
9b36d6c4d9
Re-adds and reworks fusion. ( #37384 )
...
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
2018-04-28 01:01:47 -05:00
oranges and CitadelStationBot
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
