deathride58
8ee42a5282
Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755
...
[MIRROR] All color inputs use current color as default choice
2018-01-26 15:44:23 +00:00
Jordan Brown
51e4d9f9db
All color inputs use current color as default choice
2018-01-24 18:14:16 -06:00
ACCount12
f69e5260e2
Plasma cutter now has a tool sound
2018-01-24 14:00:51 -06:00
Leo
945358fbfd
Merge pull request #34605 from ShizCalev/kinetic_accelerator-runtimes
...
Fixes some kinetic accelerator runtimes
2018-01-19 19:47:21 -06:00
deathride58
d2ec28b1e6
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
Tad Hardesty
a55d2e7ff7
Show the correct coordinates when a pulse rifle prize is found ( #34089 )
2018-01-05 06:03:05 -06:00
deathride58
aabbbb9dff
aaaand the rest of the modules folder
2018-01-04 01:45:38 -05:00
ACCount
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
ACCount
8a64287249
Integrated circuit fixes and code improvements
2017-11-21 03:04:17 -06:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
Tad Hardesty
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
ShizCalev
b79dd78089
Fixes suppressing weapons in your bag / pocket ( #30894 )
...
* Fixes suppressing in pocked and w_class issues
* Used defines for some things
* Reworded
* Removed the now redundant initial_w_class var
* Early returns
* Null
2017-09-26 04:19:44 -05:00
CitadelStationBot
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
Poojawa
0eb8cf0235
Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning ( #2759 )
...
* In hands of plasma weapons/tweaks
* Icon override states for all clothes
* a few compile issues ~
* Adds a new badmin button and plasma rifle case
* better cleanup of the sound effect
* Oh, these should've been deleted already.
2017-09-16 04:29:22 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
kevinz000
fcddd32703
Merge pull request #2195
2017-08-29 22:26:58 -07:00
kevinz000
064ade469f
sync
2017-08-29 09:35:55 -07:00
kevinz000
498bd61928
sync
2017-08-29 09:12:56 -07:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
CitadelStationBot
edf7c03070
Multiple inhand sprites fix
2017-07-30 19:58:18 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
Poojawa
789064a3a5
Clean up .rej files
2017-06-28 02:24:03 -05:00
LetterJay
e680da7de6
Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584
...
[MIRROR] Ancient Space Station [Space Spawn Ruin]
2017-06-27 21:25:50 -05:00
LetterJay
00925de5f3
Update energy_gun.dm
2017-06-27 12:20:39 -05:00
LetterJay
77295c30d4
Merge pull request #1695 from Citadel-Station-13/upstream-merge-28599
...
[MIRROR] Disablers now have an in-hand sprite (Fixes #28582 )
2017-06-26 06:21:50 -05:00
CitadelStationBot
d4c54bb0b5
Ancient Space Station [Space Spawn Ruin]
2017-06-25 11:03:27 -05:00
LetterJay
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
CitadelStationBot
8809db8230
Disablers now have an in-hand sprite ( Fixes #28582 )
2017-06-20 10:31:24 -05:00
LetterJay
4c1b223248
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
...
Selective mirror sync
2017-06-14 06:41:01 -05:00
LetterJay
55d30f865b
upstream-merge-28062
2017-06-12 12:20:07 -05:00
CitadelStationBot
53229bb7da
If you're lucky enough to get multiple lifesteal crystal modkits you can actually make use of them
2017-06-11 08:30:29 -05:00
LetterJay
4624ec7e04
upstream-merge-27899
2017-06-11 00:09:55 -05:00
LetterJay
b80a184d97
up to upstream-merge-27868
2017-06-11 00:04:00 -05:00
CitadelStationBot
c36e599a6a
Fixes AOE modkits not working because I messed up the logic ( #1400 )
2017-06-04 09:03:45 -07:00
CitadelStationBot
cb755fc6d0
Adds three unique kinetic accelerator modules to necropolis chests
2017-06-01 15:32:16 -05:00
CitadelStationBot
e9d00c2aff
[READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too ( #1191 )
2017-05-27 13:36:44 -07:00
CitadelStationBot
b089a14c53
Ports guns to Initialize
2017-05-26 19:06:39 -05:00
LetterJay
9befc09252
UAV online
2017-05-24 12:21:14 -05:00
LetterJay
c8d071ccf4
25 kill streak with a famas
2017-05-24 12:20:50 -05:00
LetterJay
a9aa36e5c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27557
2017-05-24 12:13:44 -05:00
LetterJay
936e1d3061
Missed during mirror downtime
2017-05-24 08:40:45 -05:00
