a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
7eaef36e11
d k daunkey kaung
2024-01-03 22:42:03 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
2555843026
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 03:06:56 -03:00
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00:00
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
a4f8789d68
DO it not HIT it!
...
https://github.com/tgstation/tgstation/pull/65061
2022-03-24 22:43:17 -04:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
171bd18c8a
Updated Projectile code some more.
2022-03-11 22:23:01 -05:00
c5be81c589
tg moved projectiles out of /item, added '/item' back
2022-03-06 16:29:58 -05:00
2fdb70b2b9
[DNM][DNM][WIP] Projectile backend code port and update
...
Ports#54924, #65061 , #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
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
fde859bca0
Removing priority overlays, update_icon() splitup for guns.
2020-08-20 18:33:23 +02:00
0b4185e26f
Update beam_rifle.dm
2020-07-23 18:52:18 -07:00
ce18584fb1
Update beam_rifle.dm
2020-07-23 18:47:22 -07:00
968426fd48
Combat mode component. ( #12338 )
...
* Combat mode component.
* Whoops.
* test.
* Oh
* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
a41a06bc4b
Fixing beam rifles lacking pin and pacifism checks. ( #12349 )
2020-05-24 13:29:45 -07:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
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
339ea13e00
Update beam_rifle.dm ( #11477 )
2020-03-15 20:54:23 +01:00
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
7c16830e91
ok
2020-02-07 23:31:38 -07:00
ae199cee28
Update beam_rifle.dm
2020-02-06 23:49:36 -07:00
353c13631a
Update beam_rifle.dm
2020-02-06 23:34:33 -07:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
02fbbd4f95
Ouch.
2020-01-12 16:54:08 +01:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
da502aa31d
Merge pull request #9535 from Ghommie/Ghommie-cit247
...
Fixing sniper rifles scope datum action oddity.
2019-10-24 19:05:25 -07:00
fc1f10c97f
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
e991328087
progress
2019-10-19 15:02:56 +02:00
79b4d5f663
Update beam_rifle.dm
2018-11-19 20:24:21 -08:00
5cde0d0401
Update beam_rifle.dm
2018-11-09 19:02:04 -08:00
720b25c6f5
floor fixes and gun memes
2018-09-22 03:50:37 -05:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
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
b33d2b82fb
Merge branch 'master' into mirror-38933
2018-07-14 15:26:49 -07:00
bcb1b04c40
Upstream mirror
2018-07-14 15:24:35 -07:00
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
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
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
7dc1c116d5
Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
...
Fix some missing icons
2018-05-14 15:13:33 -05:00
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
3ba3d5fb5e
beam rifle delay ( #37544 )
2018-04-30 04:53:21 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
03a4db4983
Update beam_rifle.dm
2018-04-01 23:07:35 -07:00
1077b94c4e
nerf
2018-04-01 16:37:44 -07:00
SandPoot