Commit Graph

80 Commits

Author SHA1 Message Date
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Lin
bbffd41d55 Merge pull request #12883 from Citadel-Station-13/silicons-patch-49
beam rifles are now practical in emitters
2020-07-28 22:05:39 -05:00
silicons
1c4249c99d Update medbeam.dm 2020-07-24 00:57:30 -07:00
silicons
0b4185e26f Update beam_rifle.dm 2020-07-23 18:52:18 -07:00
silicons
ce18584fb1 Update beam_rifle.dm 2020-07-23 18:47:22 -07:00
Ghom
a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
2020-06-02 15:22:06 -07:00
Ghom
968426fd48 Combat mode component. (#12338)
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
Ghom
a41a06bc4b Fixing beam rifles lacking pin and pacifism checks. (#12349) 2020-05-24 13:29:45 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
necromanceranne
26ec48f174 straight shooting guns (#11602) 2020-03-25 21:18:02 +01:00
kevinz000
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
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
ae199cee28 Update beam_rifle.dm 2020-02-06 23:49:36 -07:00
kevinz000
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
c35acf00fe Empty commit to make travis recompile. 2019-12-07 15:18:37 +01:00
Useroth
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
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
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
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
79b4d5f663 Update beam_rifle.dm 2018-11-19 20:24:21 -08:00
kevinz000
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
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
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
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